Add new configuration option

Author: bombsimon

.golangci.next.reference.yml

@@ -3788,6 +3788,12 @@ linters:
       # Defaults: [ "Unlock", "RUnlock" ]
       allow-cuddle-with-rhs: [ "Foo", "Bar" ]
 
+      # Allow cuddling with any block as long as the variable is used somewhere in
+      # the block.
+      # https://github.com/bombsimon/wsl/blob/HEAD/doc/configuration.md#allow-cuddle-used-in-block
+      # Default: false
+      allow-cuddle-used-in-block: true
+
       # Causes an error when an If statement that checks an error variable doesn't
       # cuddle with the assignment of that variable.
       # https://github.com/bombsimon/wsl/blob/HEAD/doc/configuration.md#force-err-cuddling

jsonschema/golangci.next.jsonschema.json

@@ -3954,6 +3954,11 @@
                 "type": "string"
               }
             },
+            "allow-cuddle-used-in-block": {
+              "description": "Allow cuddling with any block as long as the variable is used somewhere in the block",
+              "type": "boolean",
+              "default": false
+            },
             "allow-multiline-assign": {
               "description": "Allow multiline assignments to be cuddled.",
               "type": "boolean",

pkg/config/linters_settings.go

@@ -188,6 +188,7 @@ var defaultLintersSettings = LintersSettings{
 		AllowCuddleDeclaration:           false,
 		AllowCuddleWithCalls:             []string{"Lock", "RLock"},
 		AllowCuddleWithRHS:               []string{"Unlock", "RUnlock"},
+		AllowCuddleUsedInBlock:           false,
 		ForceCuddleErrCheckAndAssign:     false,
 		ErrorVariableNames:               []string{"err"},
 		ForceExclusiveShortDeclarations:  false,
@@ -972,6 +973,7 @@ type WSLSettings struct {
 	AllowCuddleDeclaration           bool     `mapstructure:"allow-cuddle-declarations"`
 	AllowCuddleWithCalls             []string `mapstructure:"allow-cuddle-with-calls"`
 	AllowCuddleWithRHS               []string `mapstructure:"allow-cuddle-with-rhs"`
+	AllowCuddleUsedInBlock           bool     `mapstructure:"allow-cuddle-used-in-block"`
 	ForceCuddleErrCheckAndAssign     bool     `mapstructure:"force-err-cuddling"`
 	ErrorVariableNames               []string `mapstructure:"error-variable-names"`
 	ForceExclusiveShortDeclarations  bool     `mapstructure:"force-short-decl-cuddling"`

pkg/golinters/wsl/wsl.go

@@ -23,6 +23,7 @@ func New(settings *config.WSLSettings) *goanalysis.Linter {
 			AllowCuddleWithCalls:             settings.AllowCuddleWithCalls,
 			AllowCuddleWithRHS:               settings.AllowCuddleWithRHS,
 			ForceCuddleErrCheckAndAssign:     settings.ForceCuddleErrCheckAndAssign,
+			AllowCuddleUsedInBlock:           settings.AllowCuddleUsedInBlock,
 			ErrorVariableNames:               settings.ErrorVariableNames,
 			ForceExclusiveShortDeclarations:  settings.ForceExclusiveShortDeclarations,
 			IncludeGenerated:                 true, // force to true because golangci-lint already have a way to filter generated files.