Revert "fix: deprecation message related to UseDefaultSkipDirs (#4533)"

ldez · ldez · commit 2bcc0104ea03 · 2024-03-18T23:20:06.000+01:00
This reverts commit bd47701.
diff --git a/pkg/config/loader.go b/pkg/config/loader.go
@@ -295,12 +295,12 @@ func (l *Loader) handleDeprecation() error {
 		l.cfg.Issues.ExcludeDirs = l.cfg.Run.SkipDirs
 	}
 
-	// `UseDefaultExcludeDirs` is true by default but `UseDefaultSkipDirs` is now false by default.
+	// The 2 options are true by default.
 	// Deprecated since v1.57.0
-	if l.cfg.Run.UseDefaultSkipDirs {
+	if !l.cfg.Run.UseDefaultSkipDirs {
 		l.warn("The configuration option `run.skip-dirs-use-default` is deprecated, please use `issues.exclude-dirs-use-default`.")
 	}
-	l.cfg.Issues.UseDefaultExcludeDirs = l.cfg.Run.UseDefaultSkipDirs || l.cfg.Issues.UseDefaultExcludeDirs
+	l.cfg.Issues.UseDefaultExcludeDirs = l.cfg.Run.UseDefaultSkipDirs && l.cfg.Issues.UseDefaultExcludeDirs
 
 	// The 2 options are false by default.
 	// Deprecated since v1.57.0

Original file line number	Diff line number	Diff line change
`@@ -295,12 +295,12 @@ func (l *Loader) handleDeprecation() error {`
`295`	`295`	`l.cfg.Issues.ExcludeDirs = l.cfg.Run.SkipDirs`
`296`	`296`	`}`
`297`	`297`
`298`		- // `UseDefaultExcludeDirs` is true by default but `UseDefaultSkipDirs` is now false by default.
	`298`	`+ // The 2 options are true by default.`
`299`	`299`	`// Deprecated since v1.57.0`
`300`		`- if l.cfg.Run.UseDefaultSkipDirs {`
	`300`	`+ if !l.cfg.Run.UseDefaultSkipDirs {`
`301`	`301`	l.warn("The configuration option `run.skip-dirs-use-default` is deprecated, please use `issues.exclude-dirs-use-default`.")
`302`	`302`	`}`
`303`		`- l.cfg.Issues.UseDefaultExcludeDirs = l.cfg.Run.UseDefaultSkipDirs \|\| l.cfg.Issues.UseDefaultExcludeDirs`
	`303`	`+ l.cfg.Issues.UseDefaultExcludeDirs = l.cfg.Run.UseDefaultSkipDirs && l.cfg.Issues.UseDefaultExcludeDirs`
`304`	`304`
`305`	`305`	`// The 2 options are false by default.`
`306`	`306`	`// Deprecated since v1.57.0`