build(deps): bump github.com/bombsimon/wsl/v4 from 3.4.0 to 4.2.0 (#4215)
Co-authored-by: Fernandez Ludovic <ldez@users.noreply.github.com> Co-authored-by: Simon Sawert <simon@sawert.se>
This commit is contained in:
Oleksandr Redko
GitHub
parent
f269abec96
commit
e32f2f3f8d
2
go.mod
2
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.2.0
|
||||
github.com/breml/bidichk v0.2.7
|
||||
github.com/breml/errchkjson v0.3.6
|
||||
github.com/butuzov/ireturn v0.2.2
|
||||
|
||||
7
go.sum
generated
7
go.sum
generated
@ -92,8 +92,8 @@ github.com/bkielbasa/cyclop v1.2.1 h1:AeF71HZDob1P2/pRm1so9cd1alZnrpyc4q2uP2l0gJ
|
||||
github.com/bkielbasa/cyclop v1.2.1/go.mod h1:K/dT/M0FPAiYjBgQGau7tz+3TMh4FWAEqlMhzFWCrgM=
|
||||
github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M=
|
||||
github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k=
|
||||
github.com/bombsimon/wsl/v3 v3.4.0 h1:RkSxjT3tmlptwfgEgTgU+KYKLI35p/tviNXNXiL2aNU=
|
||||
github.com/bombsimon/wsl/v3 v3.4.0/go.mod h1:KkIB+TXkqy6MvK9BDZVbZxKNYsE1/oLRJbIFtf14qqo=
|
||||
github.com/bombsimon/wsl/v4 v4.2.0 h1:dKK3o/Hk2aIt6t72CWg02ham2P5lnH9MBSW6cTU9xxU=
|
||||
github.com/bombsimon/wsl/v4 v4.2.0/go.mod h1:1zaTbf/7ywOQtMdoUdTF2X1fbbBLiBUkajyuFAanT28=
|
||||
github.com/breml/bidichk v0.2.7 h1:dAkKQPLl/Qrk7hnP6P+E0xOodrq8Us7+U0o4UBOAlQY=
|
||||
github.com/breml/bidichk v0.2.7/go.mod h1:YodjipAGI9fGcYM7II6wFvGhdMYsC5pHDlGzqvEW3tQ=
|
||||
github.com/breml/errchkjson v0.3.6 h1:VLhVkqSBH96AvXEyclMR37rZslRrY2kcyq+31HCsVrA=
|
||||
@ -400,7 +400,6 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
|
||||
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
||||
github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U=
|
||||
github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE=
|
||||
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
|
||||
github.com/nishanths/exhaustive v0.12.0 h1:vIY9sALmw6T/yxiASewa4TQcFsVYZQQRUQJhKRf3Swg=
|
||||
github.com/nishanths/exhaustive v0.12.0/go.mod h1:mEZ95wPIZW+x8kC4TgC+9YCUgiST7ecevsVDTgc2obs=
|
||||
github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk=
|
||||
@ -992,8 +991,8 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
|
||||
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
|
||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
|
||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
|
||||
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
||||
|
||||
@ -1,89 +1,39 @@
|
||||
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
|
||||
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,
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
},
|
||||
}
|
||||
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)
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user