build(deps): bump github.com/bombsimon/wsl/v5 from 4.7.0 to 5.0.0 (#5900)

Co-authored-by: Fernandez Ludovic <ldez@users.noreply.github.com>

Author: bombsimon

.golangci.next.reference.yml

@@ -126,6 +126,7 @@ linters:
     - whitespace
     - wrapcheck
     - wsl
+    - wsl_v5
     - zerologlint
 
   # Disable specific linters.
@@ -236,6 +237,7 @@ linters:
     - whitespace
     - wrapcheck
     - wsl
+    - wsl_v5
     - zerologlint
 
   # All available settings of specific linters.
@@ -3912,6 +3914,93 @@ linters:
       # Default: false
       force-short-decl-cuddling: true
 
+    wsl_v5:
+      # Allow cuddling a variable if it's used first in the immediate following block,
+      # even if the statement with the block doesn't use the variable.
+      # https://github.com/bombsimon/wsl/tree/main?tab=readme-ov-file#configuration
+      # Default: true
+      allow-first-in-block: false
+
+      # Same as above,
+      # but allows cuddling if the variable is used anywhere in the following (or nested) block.
+      # https://github.com/bombsimon/wsl/tree/main?tab=readme-ov-file#configuration
+      # Default: false
+      allow-whole-block: true
+
+      # If a block contains more than this number of lines,
+      # the branch statement needs to be separated by whitespace.
+      # https://github.com/bombsimon/wsl/tree/main?tab=readme-ov-file#configuration
+      # Default: 2
+      branch-max-lines: 4
+
+      # If set to a non-negative number,
+      # case blocks need to end with whitespace if exceeding this number
+      # https://github.com/bombsimon/wsl/tree/main?tab=readme-ov-file#configuration
+      # Default: 0
+      case-max-lines: 2
+
+      # Default checks to use.
+      # Can be `all`, `none`, `default` or empty.
+      # https://github.com/bombsimon/wsl/tree/main?tab=readme-ov-file#checks-and-configuration
+      # Default: ""
+      default: all
+
+      # Enabled checks.
+      # Will be additive to any presets.
+      # https://github.com/bombsimon/wsl/tree/main?tab=readme-ov-file#checks-and-configuration
+      # Default: []
+      enable:
+        - assign
+        - branch
+        - decl
+        - defer
+        - expr
+        - for
+        - go
+        - if
+        - inc-dec
+        - label
+        - range
+        - return
+        - select
+        - send
+        - switch
+        - type-switch
+        - append
+        - assign-exclusive
+        - assign-expr
+        - err
+        - leading-whitespace
+        - trailing-whitespace
+
+      # Disable checks.
+      # Will be subtractive to any preset.
+      # https://github.com/bombsimon/wsl/tree/main?tab=readme-ov-file#checks-and-configuration
+      # Default: []
+      disable:
+        - assign
+        - branch
+        - decl
+        - defer
+        - expr
+        - for
+        - go
+        - if
+        - inc-dec
+        - label
+        - range
+        - return
+        - select
+        - send
+        - switch
+        - type-switch
+        - append
+        - assign-exclusive
+        - assign-expr
+        - err
+        - leading-whitespace
+        - trailing-whitespace
+
     # The custom section can be used to define linter plugins to be loaded at runtime.
     # See README documentation for more info.
     custom:

.golangci.yml

@@ -187,6 +187,12 @@ linters:
         linters:
           - dupl
 
+      # Deprecated linters
+      - path: pkg/lint/lintersdb/builder_linter.go
+        text: "SA1019: wsl.NewV4 is deprecated: use NewV5 instead."
+        linters:
+        - staticcheck
+
 formatters:
   enable:
     - gofmt

go.mod

@@ -26,6 +26,7 @@ require (
 	github.com/bkielbasa/cyclop v1.2.3
 	github.com/blizzy78/varnamelen v0.8.0
 	github.com/bombsimon/wsl/v4 v4.7.0
+	github.com/bombsimon/wsl/v5 v5.0.0
 	github.com/breml/bidichk v0.3.3
 	github.com/breml/errchkjson v0.4.1
 	github.com/butuzov/ireturn v0.4.0

go.sum

@@ -685,6 +685,32 @@
         "header"
       ]
     },
+    "wsl-checks": {
+      "enum": [
+        "assign",
+        "branch",
+        "decl",
+        "defer",
+        "expr",
+        "for",
+        "go",
+        "if",
+        "inc-dec",
+        "label",
+        "range",
+        "return",
+        "select",
+        "send",
+        "switch",
+        "type-switch",
+        "append",
+        "assign-exclusive",
+        "assign-expr",
+        "err",
+        "leading-whitespace",
+        "trailing-whitespace"
+      ]
+    },
     "relative-path-modes": {
       "enum": [
         "gomod",
@@ -829,6 +855,7 @@
             "whitespace",
             "wrapcheck",
             "wsl",
+            "wsl_v5",
             "zerologlint"
           ]
         },
@@ -4090,6 +4117,44 @@
             }
           }
         },
+        "wslSettingsV5": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "allow-first-in-block": {
+              "type": "boolean",
+              "default": true
+            },
+            "allow-whole-block": {
+              "type": "boolean",
+              "default": false
+            },
+            "branch-max-lines": {
+              "type": "integer",
+              "default": 2
+            },
+            "case-max-lines": {
+              "type": "integer",
+              "default": 0
+            },
+            "default": {
+              "enum": ["all", "none", "default", ""],
+              "default": "default"
+            },
+            "enable": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/wsl-checks"
+              }
+            },
+            "disable": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/wsl-checks"
+              }
+            }
+          }
+        },
         "copyloopvarSettings": {
           "type": "object",
           "additionalProperties": false,
@@ -4592,6 +4657,9 @@
             "wsl": {
               "$ref": "#/definitions/settings/definitions/wslSettings"
             },
+            "wsl_v5": {
+              "$ref": "#/definitions/settings/definitions/wslSettingsV5"
+            },
             "copyloopvar": {
               "$ref": "#/definitions/settings/definitions/copyloopvarSettings"
             },

jsonschema/golangci.next.jsonschema.json

@@ -998,8 +998,8 @@ func toWrapcheckSettings(old versionone.WrapcheckSettings) versiontwo.WrapcheckS
 	}
 }
 
-func toWSLSettings(old versionone.WSLSettings) versiontwo.WSLSettings {
-	return versiontwo.WSLSettings{
+func toWSLSettings(old versionone.WSLSettings) versiontwo.WSLv4Settings {
+	return versiontwo.WSLv4Settings{
 		StrictAppend:                     old.StrictAppend,
 		AllowAssignAndCallCuddle:         old.AllowAssignAndCallCuddle,
 		AllowAssignAndAnythingCuddle:     old.AllowAssignAndAnythingCuddle,