Skip to content

dev: review config path usage inside gocritic #4517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2024
Merged

dev: review config path usage inside gocritic #4517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
180824a
chore: use cfg.GetConfigDir directly
ldez Mar 15, 2024
eb00591
chore: remove configuration as parameter
ldez Mar 15, 2024
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
15 changes: 8 additions & 7 deletions pkg/golinters/gocritic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,12 @@ var (
isGoCriticDebug = logutils.HaveDebugTag(logutils.DebugKeyGoCritic)
)

func NewGoCritic(settings *config.GoCriticSettings, cfg *config.Config) *goanalysis.Linter {
func NewGoCritic(settings *config.GoCriticSettings) *goanalysis.Linter {
var mu sync.Mutex
var resIssues []goanalysis.Issue

wrapper := &goCriticWrapper{
getConfigDir: cfg.GetConfigDir, // Config directory is filled after calling this constructor.
sizes: types.SizesFor("gc", runtime.GOARCH),
sizes: types.SizesFor("gc", runtime.GOARCH),
}

analyzer := &analysis.Analyzer{
Expand Down Expand Up @@ -71,7 +70,9 @@ Dynamic rules are written declaratively with AST patterns, filters, report messa
nil,
).
WithContextSetter(func(context *linter.Context) {
wrapper.init(settings, context.Log)
wrapper.configDir = context.Cfg.GetConfigDir()

wrapper.init(context.Log, settings)
}).
WithIssuesReporter(func(*linter.Context) []goanalysis.Issue {
return resIssues
Expand All @@ -81,12 +82,12 @@ Dynamic rules are written declaratively with AST patterns, filters, report messa

type goCriticWrapper struct {
settingsWrapper *goCriticSettingsWrapper
getConfigDir func() string
configDir string
sizes types.Sizes
once sync.Once
}

func (w *goCriticWrapper) init(settings *config.GoCriticSettings, logger logutils.Log) {
func (w *goCriticWrapper) init(logger logutils.Log, settings *config.GoCriticSettings) {
if settings == nil {
return
}
Expand Down Expand Up @@ -206,7 +207,7 @@ func (w *goCriticWrapper) normalizeCheckerParamsValue(p any) any {
return rv.Bool()
case reflect.String:
// Perform variable substitution.
return strings.ReplaceAll(rv.String(), "${configDir}", w.getConfigDir())
return strings.ReplaceAll(rv.String(), "${configDir}", w.configDir)
default:
return p
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/lint/lintersdb/builder_linter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ func (b LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
WithPresets(linter.PresetStyle).
WithURL("https://github.com/jgautheron/goconst"),

linter.NewConfig(golinters.NewGoCritic(&cfg.LintersSettings.Gocritic, cfg)).
linter.NewConfig(golinters.NewGoCritic(&cfg.LintersSettings.Gocritic)).
WithSince("v1.12.0").
WithPresets(linter.PresetStyle, linter.PresetMetaLinter).
WithLoadForGoAnalysis().
Expand Down