Skip to content

Commit 5d5a0db

Browse files
committed
chore: groups nlreturn files to a package
1 parent 7f17bbb commit 5d5a0db

File tree

6 files changed

+16
-4
lines changed

6 files changed

+16
-4
lines changed

pkg/golinters/nlreturn.go renamed to pkg/golinters/nlreturn/nlreturn.go

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

33
import (
44
"github.com/ssgreg/nlreturn/v2/pkg/nlreturn"
@@ -8,7 +8,7 @@ import (
88
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

11-
func NewNLReturn(settings *config.NlreturnSettings) *goanalysis.Linter {
11+
func New(settings *config.NlreturnSettings) *goanalysis.Linter {
1212
a := nlreturn.NewAnalyzer()
1313

1414
cfg := 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 nlreturn
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+
}

test/testdata/nlreturn-block-size.go renamed to pkg/golinters/nlreturn/testdata/nlreturn-block-size.go

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

55
func foo0(n int) int {

pkg/lint/lintersdb/builder_linter.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ import (
7272
"github.com/golangci/golangci-lint/pkg/golinters/nestif"
7373
"github.com/golangci/golangci-lint/pkg/golinters/nilerr"
7474
"github.com/golangci/golangci-lint/pkg/golinters/nilnil"
75+
"github.com/golangci/golangci-lint/pkg/golinters/nlreturn"
7576
"github.com/golangci/golangci-lint/pkg/golinters/nolintlint"
7677
"github.com/golangci/golangci-lint/pkg/golinters/protogetter"
7778
"github.com/golangci/golangci-lint/pkg/golinters/spancheck"
@@ -547,7 +548,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
547548
WithLoadForGoAnalysis().
548549
WithURL("https://github.com/Antonboom/nilnil"),
549550

550-
linter.NewConfig(golinters.NewNLReturn(&cfg.LintersSettings.Nlreturn)).
551+
linter.NewConfig(nlreturn.New(&cfg.LintersSettings.Nlreturn)).
551552
WithSince("v1.30.0").
552553
WithPresets(linter.PresetStyle).
553554
WithURL("https://github.com/ssgreg/nlreturn"),

0 commit comments

Comments
 (0)