build(deps): bump github.com/bombsimon/wsl/v4 from 3.4.0 to 4.1.0

Author: alexandear

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/ashanbrown/makezero v1.1.1
 	github.com/bkielbasa/cyclop v1.2.1
 	github.com/blizzy78/varnamelen v0.8.0
-	github.com/bombsimon/wsl/v3 v3.4.0
+	github.com/bombsimon/wsl/v4 v4.1.0
 	github.com/breml/bidichk v0.2.7
 	github.com/breml/errchkjson v0.3.6
 	github.com/butuzov/ireturn v0.2.2

go.sum

@@ -1,89 +1,38 @@
 package golinters
 
 import (
-	"sync"
-
-	"github.com/bombsimon/wsl/v3"
+	"github.com/bombsimon/wsl/v4"
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
-	"github.com/golangci/golangci-lint/pkg/lint/linter"
-	"github.com/golangci/golangci-lint/pkg/result"
 )
 
-const wslName = "wsl"
-
-// NewWSL returns a new WSL linter.
 func NewWSL(settings *config.WSLSettings) *goanalysis.Linter {
-	var mu sync.Mutex
-	var resIssues []goanalysis.Issue
-
-	conf := wsl.DefaultConfig()
-
+	var conf *wsl.Configuration
 	if settings != nil {
-		conf.StrictAppend = settings.StrictAppend
-		conf.AllowAssignAndCallCuddle = settings.AllowAssignAndCallCuddle
-		conf.AllowAssignAndAnythingCuddle = settings.AllowAssignAndAnythingCuddle
-		conf.AllowMultiLineAssignCuddle = settings.AllowMultiLineAssignCuddle
-		conf.ForceCaseTrailingWhitespaceLimit = settings.ForceCaseTrailingWhitespaceLimit
-		conf.AllowTrailingComment = settings.AllowTrailingComment
-		conf.AllowSeparatedLeadingComment = settings.AllowSeparatedLeadingComment
-		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{
-		Name: goanalysis.TheOnlyAnalyzerName,
-		Doc:  goanalysis.TheOnlyanalyzerDoc,
-		Run: func(pass *analysis.Pass) (any, error) {
-			issues := runWSL(pass, &conf)
-
-			if len(issues) == 0 {
-				return nil, nil
-			}
-
-			mu.Lock()
-			resIssues = append(resIssues, issues...)
-			mu.Unlock()
-
-			return nil, nil
-		},
+		conf = &wsl.Configuration{
+			StrictAppend:                     settings.StrictAppend,
+			AllowAssignAndCallCuddle:         settings.AllowAssignAndCallCuddle,
+			AllowAssignAndAnythingCuddle:     settings.AllowAssignAndAnythingCuddle,
+			AllowMultiLineAssignCuddle:       settings.AllowMultiLineAssignCuddle,
+			ForceCaseTrailingWhitespaceLimit: settings.ForceCaseTrailingWhitespaceLimit,
+			AllowTrailingComment:             settings.AllowTrailingComment,
+			AllowSeparatedLeadingComment:     settings.AllowSeparatedLeadingComment,
+			AllowCuddleDeclaration:           settings.AllowCuddleDeclaration,
+			AllowCuddleWithCalls:             settings.AllowCuddleWithCalls,
+			AllowCuddleWithRHS:               settings.AllowCuddleWithRHS,
+			ForceCuddleErrCheckAndAssign:     settings.ForceCuddleErrCheckAndAssign,
+			ErrorVariableNames:               settings.ErrorVariableNames,
+			ForceExclusiveShortDeclarations:  settings.ForceExclusiveShortDeclarations,
+		}
 	}
 
+	a := wsl.NewAnalyzer(conf)
 	return goanalysis.NewLinter(
-		wslName,
-		"Whitespace Linter - Forces you to use empty lines!",
-		[]*analysis.Analyzer{analyzer},
+		a.Name,
+		a.Doc,
+		[]*analysis.Analyzer{a},
 		nil,
-	).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue {
-		return resIssues
-	}).WithLoadMode(goanalysis.LoadModeSyntax)
-}
-
-func runWSL(pass *analysis.Pass, conf *wsl.Configuration) []goanalysis.Issue {
-	if conf == nil {
-		return nil
-	}
-
-	files := getFileNames(pass)
-	wslErrors, _ := wsl.NewProcessorWithConfig(*conf).ProcessFiles(files)
-	if len(wslErrors) == 0 {
-		return nil
-	}
-
-	var issues []goanalysis.Issue
-	for _, err := range wslErrors {
-		issues = append(issues, goanalysis.NewIssue(&result.Issue{
-			FromLinter: wslName,
-			Pos:        err.Position,
-			Text:       err.Reason,
-		}, pass))
-	}
-
-	return issues
+	).WithLoadMode(goanalysis.LoadModeSyntax)
 }

pkg/golinters/wsl.go

@@ -266,16 +266,6 @@ func TestLineDirective(t *testing.T) {
 			targetPath: "linedirective",
 			expected:   "is a misspelling of `language` (misspell)",
 		},
-		{
-			desc: "wsl",
-			args: []string{
-				"-Ewsl",
-				"--disable-all",
-			},
-			configPath: "",
-			targetPath: "linedirective",
-			expected:   "block should not start with a whitespace (wsl)",
-		},
 	}
 
 	for _, test := range testCases {