chore: refactor deprecation handling

ldez · ldez · commit 1c10d9e05068 · 2024-03-24T14:09:54.000+01:00
diff --git a/pkg/config/loader.go b/pkg/config/loader.go
@@ -322,6 +322,12 @@ func (l *Loader) handleDeprecation() error {
 		l.cfg.Output.Formats = f
 	}
 
+	l.handleLinterOptionDeprecations()
+
+	return nil
+}
+
+func (l *Loader) handleLinterOptionDeprecations() {
 	// Deprecated since v1.57.0,
 	// but it was unofficially deprecated since v1.19 (2019) (https://github.com/golangci/golangci-lint/pull/697).
 	if l.cfg.LintersSettings.Govet.CheckShadowing {
@@ -365,8 +371,6 @@ func (l *Loader) handleDeprecation() error {
 	if l.cfg.LintersSettings.Stylecheck.GoVersion != "" {
 		l.warn("The configuration option `linters.stylecheck.go` is deprecated, please use global `run.go`.")
 	}
-
-	return nil
 }
 
 func (l *Loader) handleEnableOnlyOption() error {

Original file line number	Diff line number	Diff line change
`@@ -322,6 +322,12 @@ func (l *Loader) handleDeprecation() error {`
`322`	`322`	`l.cfg.Output.Formats = f`
`323`	`323`	`}`
`324`	`324`
	`325`	`+ l.handleLinterOptionDeprecations()`
	`326`	`+`
	`327`	`+ return nil`
	`328`	`+}`
	`329`	`+`
	`330`	`+func (l *Loader) handleLinterOptionDeprecations() {`
`325`	`331`	`// Deprecated since v1.57.0,`
`326`	`332`	`// but it was unofficially deprecated since v1.19 (2019) (https://github.com/golangci/golangci-lint/pull/697).`
`327`	`333`	`if l.cfg.LintersSettings.Govet.CheckShadowing {`
`@@ -365,8 +371,6 @@ func (l *Loader) handleDeprecation() error {`
`365`	`371`	`if l.cfg.LintersSettings.Stylecheck.GoVersion != "" {`
`366`	`372`	l.warn("The configuration option `linters.stylecheck.go` is deprecated, please use global `run.go`.")
`367`	`373`	`}`
`368`		`-`
`369`		`- return nil`
`370`	`374`	`}`
`371`	`375`
`372`	`376`	`func (l *Loader) handleEnableOnlyOption() error {`