Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions pkg/golinters/revive/revive.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,14 @@ func New(settings *config.ReviveSettings) *goanalysis.Linter {
[]*analysis.Analyzer{analyzer},
nil,
).WithContextSetter(func(lintCtx *linter.Context) {
conf, err := getReviveConfig(settings)
if err != nil {
lintCtx.Log.Errorf("failed to get revive config: %v", err)
return
}

analyzer.Run = func(pass *analysis.Pass) (any, error) {
issues, err := runRevive(lintCtx, pass, settings)
issues, err := runRevive(lintCtx, pass, settings, conf)
if err != nil {
return nil, err
}
Expand All @@ -70,14 +76,10 @@ func New(settings *config.ReviveSettings) *goanalysis.Linter {
}).WithLoadMode(goanalysis.LoadModeSyntax)
}

func runRevive(lintCtx *linter.Context, pass *analysis.Pass, settings *config.ReviveSettings) ([]goanalysis.Issue, error) {
func runRevive(lintCtx *linter.Context, pass *analysis.Pass, settings *config.ReviveSettings, conf *lint.Config,
) ([]goanalysis.Issue, error) {
packages := [][]string{internal.GetFileNames(pass)}

conf, err := getReviveConfig(settings)
if err != nil {
return nil, err
}

formatter, err := reviveConfig.GetFormatter("json")
if err != nil {
return nil, err
Expand Down