govet: fix check-shadowing (#4534)

golangci · Mar 19, 2024 · 6914447 · 6914447
1 parent 2bcc010
commit 6914447
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkg/golinters/govet.go b/pkg/golinters/govet.go
@@ -166,11 +166,6 @@ func analyzersFromConfig(settings *config.GovetSettings) []*analysis.Analyzer {
 		return defaultAnalyzers
 	}
 
-	if settings.CheckShadowing {
-		// Keeping for backward compatibility.
-		settings.Enable = append(settings.Enable, shadow.Analyzer.Name)
-	}
-
 	var enabledAnalyzers []*analysis.Analyzer
 	for _, a := range allAnalyzers {
 		if isAnalyzerEnabled(a.Name, settings, defaultAnalyzers) {
@@ -189,6 +184,11 @@ func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers
 		return false
 	}
 
+	// Keeping for backward compatibility.
+	if cfg.CheckShadowing && name == shadow.Analyzer.Name {
+		return true
+	}
+
 	switch {
 	case cfg.EnableAll:
 		return !slices.Contains(cfg.Disable, name)