wsl: fix force-err-cuddling flag (#3407)

golangci · Dec 12, 2022 · 0cc3585 · 0cc3585
1 parent b2462ed
commit 0cc3585
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.golangci.reference.yml b/.golangci.reference.yml
@@ -1928,15 +1928,15 @@ linters-settings:
 
     # Causes an error when an If statement that checks an error variable doesn't
     # cuddle with the assignment of that variable.
-    enforce-err-cuddling: false
+    force-err-cuddling: false
 
-    # When enforce-err-cuddling is enabled this is a list of names
+    # When force-err-cuddling is enabled this is a list of names
     # used for error variables to check for in the conditional.
     error-variable-names: [ "err" ]
 
     # Causes an error if a short declaration (:=) cuddles with anything other than
     # another short declaration.
-    # This logic overrides enforce-err-cuddling among others.
+    # This logic overrides force-err-cuddling among others.
     force-short-decl-cuddling: false
 
   # The custom section can be used to define linter plugins to be loaded at runtime.

diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -713,7 +713,7 @@ type WSLSettings struct {
 	AllowCuddleDeclaration           bool     `mapstructure:"allow-cuddle-declarations"`
 	AllowCuddleWithCalls             []string `mapstructure:"allow-cuddle-with-calls"`
 	AllowCuddleWithRHS               []string `mapstructure:"allow-cuddle-with-rhs"`
-	ForceCuddleErrCheckAndAssign     bool     `mapstructure:"enforce-err-cuddling"`
+	ForceCuddleErrCheckAndAssign     bool     `mapstructure:"force-err-cuddling"`
 	ErrorVariableNames               []string `mapstructure:"error-variable-names"`
 	ForceExclusiveShortDeclarations  bool     `mapstructure:"force-short-decl-cuddling"`
 }

diff --git a/pkg/golinters/wsl.go b/pkg/golinters/wsl.go
@@ -32,6 +32,9 @@ func NewWSL(settings *config.WSLSettings) *goanalysis.Linter {
 		conf.AllowCuddleDeclaration = settings.AllowCuddleDeclaration
 		conf.AllowCuddleWithCalls = settings.AllowCuddleWithCalls
 		conf.AllowCuddleWithRHS = settings.AllowCuddleWithRHS
+		conf.ForceCuddleErrCheckAndAssign = settings.ForceCuddleErrCheckAndAssign
+		conf.ErrorVariableNames = settings.ErrorVariableNames
+		conf.ForceExclusiveShortDeclarations = settings.ForceExclusiveShortDeclarations
 	}
 
 	analyzer := &analysis.Analyzer{