Skip to content

Commit 825d1a8

Browse files
committed
chore: groups wsl files to a package
1 parent 8325f51 commit 825d1a8

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

test/testdata/wsl.go pkg/golinters/wsl/testdata/wsl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//golangcitest:args -Ewsl
2-
//golangcitest:config_path testdata/configs/wsl.yml
2+
//golangcitest:config_path testdata/wsl.yml
33
package testdata
44

55
import (
File renamed without changes.

pkg/golinters/wsl.go pkg/golinters/wsl/wsl.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package golinters
1+
package wsl
22

33
import (
44
"github.com/bombsimon/wsl/v4"
@@ -8,7 +8,7 @@ import (
88
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

11-
func NewWSL(settings *config.WSLSettings) *goanalysis.Linter {
11+
func New(settings *config.WSLSettings) *goanalysis.Linter {
1212
var conf *wsl.Configuration
1313
if settings != nil {
1414
conf = &wsl.Configuration{
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package wsl
2+
3+
import (
4+
"testing"
5+
6+
"github.com/golangci/golangci-lint/test/testshared/integration"
7+
)
8+
9+
func TestFromTestdata(t *testing.T) {
10+
integration.RunTestdata(t)
11+
}

pkg/lint/lintersdb/builder_linter.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ import (
107107
"github.com/golangci/golangci-lint/pkg/golinters/wastedassign"
108108
"github.com/golangci/golangci-lint/pkg/golinters/whitespace"
109109
"github.com/golangci/golangci-lint/pkg/golinters/wrapcheck"
110+
"github.com/golangci/golangci-lint/pkg/golinters/wsl"
110111
"github.com/golangci/golangci-lint/pkg/golinters/zerologlint"
111112
"github.com/golangci/golangci-lint/pkg/lint/linter"
112113
)
@@ -813,7 +814,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
813814
WithLoadForGoAnalysis().
814815
WithURL("https://github.com/tomarrell/wrapcheck"),
815816

816-
linter.NewConfig(golinters.NewWSL(&cfg.LintersSettings.WSL)).
817+
linter.NewConfig(wsl.New(&cfg.LintersSettings.WSL)).
817818
WithSince("v1.20.0").
818819
WithPresets(linter.PresetStyle).
819820
WithURL("https://github.com/bombsimon/wsl"),

0 commit comments

Comments
 (0)