Update wsl to v3.0.0

* Support to force cuddle with error checking
* Support to separate leading comments with empty lines

Author: bombsimon

.golangci.example.yml

@@ -237,6 +237,10 @@ linters-settings:
     allow-trailing-comment: false
     # Force newlines in end of case at this limit (0 = never).
     force-case-trailing-whitespace: 0
+    # Force cuddling of err checks with err var assignment
+    force-err-cuddling: false
+    # Allow leading comments to be separated with empty liens
+    allow-separated-leading-comment: false
 
   # The custom section can be used to define linter plugins to be loaded at runtime. See README doc
   #  for more info.

README.md

@@ -847,6 +847,10 @@ linters-settings:
     allow-trailing-comment: false
     # Force newlines in end of case at this limit (0 = never).
     force-case-trailing-whitespace: 0
+    # Force cuddling of err checks with err var assignment
+    force-err-cuddling: false
+    # Allow leading comments to be separated with empty liens
+    allow-separated-leading-comment: false
 
   # The custom section can be used to define linter plugins to be loaded at runtime. See README doc
   #  for more info.

pkg/config/config.go

@@ -268,7 +268,9 @@ type WSLSettings struct {
 	AllowMultiLineAssignCuddle       bool `mapstructure:"allow-multiline-assign"`
 	AllowCuddleDeclaration           bool `mapstructure:"allow-cuddle-declarations"`
 	AllowTrailingComment             bool `mapstructure:"allow-trailing-comment"`
-	CaseForceTrailingWhitespaceLimit int  `mapstructure:"force-case-trailing-whitespace:"`
+	AllowSeparatedLeadingComment     bool `mapstructure:"allow-separated-leading-comment"`
+	ForceCuddleErrCheckAndAssign     bool `mapstructure:"force-err-cuddling"`
+	ForceCaseTrailingWhitespaceLimit int  `mapstructure:"force-case-trailing-whitespace"`
 }
 
 //nolint:gomnd
@@ -306,7 +308,9 @@ var defaultLintersSettings = LintersSettings{
 		AllowMultiLineAssignCuddle:       true,
 		AllowCuddleDeclaration:           false,
 		AllowTrailingComment:             false,
-		CaseForceTrailingWhitespaceLimit: 0,
+		AllowSeparatedLeadingComment:     false,
+		ForceCuddleErrCheckAndAssign:     false,
+		ForceCaseTrailingWhitespaceLimit: 0,
 	},
 }
 

pkg/golinters/wsl.go

@@ -3,7 +3,7 @@ package golinters
 import (
 	"sync"
 
-	"github.com/bombsimon/wsl/v2"
+	"github.com/bombsimon/wsl/v3"
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
@@ -42,9 +42,12 @@ func NewWSL() *goanalysis.Linter {
 					AllowMultiLineAssignCuddle:       linterCfg.AllowMultiLineAssignCuddle,
 					AllowCuddleDeclaration:           linterCfg.AllowCuddleDeclaration,
 					AllowTrailingComment:             linterCfg.AllowTrailingComment,
-					CaseForceTrailingWhitespaceLimit: linterCfg.CaseForceTrailingWhitespaceLimit,
+					AllowSeparatedLeadingComment:     linterCfg.AllowSeparatedLeadingComment,
+					ForceCuddleErrCheckAndAssign:     linterCfg.ForceCuddleErrCheckAndAssign,
+					ForceCaseTrailingWhitespaceLimit: linterCfg.ForceCaseTrailingWhitespaceLimit,
 					AllowCuddleWithCalls:             []string{"Lock", "RLock"},
 					AllowCuddleWithRHS:               []string{"Unlock", "RUnlock"},
+					ErrorVariableNames:               []string{"err"},
 				}
 			)