Skip to content

Commit 6914447

Browse files
authored
govet: fix check-shadowing (#4534)
1 parent 2bcc010 commit 6914447

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkg/golinters/govet.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,6 @@ func analyzersFromConfig(settings *config.GovetSettings) []*analysis.Analyzer {
166166
return defaultAnalyzers
167167
}
168168

169-
if settings.CheckShadowing {
170-
// Keeping for backward compatibility.
171-
settings.Enable = append(settings.Enable, shadow.Analyzer.Name)
172-
}
173-
174169
var enabledAnalyzers []*analysis.Analyzer
175170
for _, a := range allAnalyzers {
176171
if isAnalyzerEnabled(a.Name, settings, defaultAnalyzers) {
@@ -189,6 +184,11 @@ func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers
189184
return false
190185
}
191186

187+
// Keeping for backward compatibility.
188+
if cfg.CheckShadowing && name == shadow.Analyzer.Name {
189+
return true
190+
}
191+
192192
switch {
193193
case cfg.EnableAll:
194194
return !slices.Contains(cfg.Disable, name)

0 commit comments

Comments
 (0)