Skip to content

Commit 5454e9e

Browse files
committed
chore: groups testifylint files to a package
1 parent ffd3370 commit 5454e9e

8 files changed

+17
-5
lines changed

test/testdata/testifylint_bool_compare_only.go renamed to pkg/golinters/testifylint/testdata/testifylint_bool_compare_only.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//golangcitest:args -Etestifylint
2-
//golangcitest:config_path testdata/configs/testifylint_bool_compare_only.yml
2+
//golangcitest:config_path testdata/testifylint_bool_compare_only.yml
33
package testdata
44

55
import (

test/testdata/testifylint_require_error_only.go renamed to pkg/golinters/testifylint/testdata/testifylint_require_error_only.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//golangcitest:args -Etestifylint
2-
//golangcitest:config_path testdata/configs/testifylint_require_error_only.yml
2+
//golangcitest:config_path testdata/testifylint_require_error_only.yml
33
package testdata
44

55
import (

pkg/golinters/testifylint.go renamed to pkg/golinters/testifylint/testifylint.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package golinters
1+
package testifylint
22

33
import (
44
"github.com/Antonboom/testifylint/analyzer"
@@ -8,7 +8,7 @@ import (
88
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

11-
func NewTestifylint(settings *config.TestifylintSettings) *goanalysis.Linter {
11+
func New(settings *config.TestifylintSettings) *goanalysis.Linter {
1212
a := analyzer.New()
1313

1414
cfg := make(map[string]map[string]any)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package testifylint
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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ import (
9595
"github.com/golangci/golangci-lint/pkg/golinters/tagliatelle"
9696
"github.com/golangci/golangci-lint/pkg/golinters/tenv"
9797
"github.com/golangci/golangci-lint/pkg/golinters/testableexamples"
98+
"github.com/golangci/golangci-lint/pkg/golinters/testifylint"
9899
"github.com/golangci/golangci-lint/pkg/golinters/whitespace"
99100
"github.com/golangci/golangci-lint/pkg/golinters/zerologlint"
100101
"github.com/golangci/golangci-lint/pkg/lint/linter"
@@ -713,7 +714,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
713714
WithPresets(linter.PresetTest).
714715
WithURL("https://github.com/maratori/testableexamples"),
715716

716-
linter.NewConfig(golinters.NewTestifylint(&cfg.LintersSettings.Testifylint)).
717+
linter.NewConfig(testifylint.New(&cfg.LintersSettings.Testifylint)).
717718
WithSince("v1.55.0").
718719
WithPresets(linter.PresetTest, linter.PresetBugs).
719720
WithLoadForGoAnalysis().

0 commit comments

Comments
 (0)