eeafj/golangci-lint
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

govet: fix check-shadowing (#4534)

Browse Source
This commit is contained in:
Ludovic Fernandez 2024-03-19 06:43:24 +01:00 committed by GitHub
parent 2bcc0104ea
commit 69144471ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/golinters/govet.go
View File

@ -166,11 +166,6 @@ func analyzersFromConfig(settings *config.GovetSettings) []*analysis.Analyzer {
return defaultAnalyzers return defaultAnalyzers
} }
if settings.CheckShadowing {
// Keeping for backward compatibility.
settings.Enable = append(settings.Enable, shadow.Analyzer.Name)
}
var enabledAnalyzers []*analysis.Analyzer var enabledAnalyzers []*analysis.Analyzer
for _, a := range allAnalyzers { for _, a := range allAnalyzers {
if isAnalyzerEnabled(a.Name, settings, defaultAnalyzers) { if isAnalyzerEnabled(a.Name, settings, defaultAnalyzers) {
@ -189,6 +184,11 @@ func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers
return false return false
} }
// Keeping for backward compatibility.
if cfg.CheckShadowing && name == shadow.Analyzer.Name {
return true
}
switch { switch {
case cfg.EnableAll: case cfg.EnableAll:
return !slices.Contains(cfg.Disable, name) return !slices.Contains(cfg.Disable, name)