Skip to content

Commit 7f51c8a

Browse files
committed
chore: groups gocyclo files to a package
1 parent ea02b9a commit 7f51c8a

File tree

5 files changed

+20
-8
lines changed

5 files changed

+20
-8
lines changed

pkg/golinters/gocyclo.go renamed to pkg/golinters/gocyclo/gocyclo.go

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

33
import (
44
"fmt"
@@ -14,14 +14,14 @@ import (
1414
"github.com/golangci/golangci-lint/pkg/result"
1515
)
1616

17-
const gocycloName = "gocyclo"
17+
const name = "gocyclo"
1818

19-
func NewGocyclo(settings *config.GoCycloSettings) *goanalysis.Linter {
19+
func New(settings *config.GoCycloSettings) *goanalysis.Linter {
2020
var mu sync.Mutex
2121
var resIssues []goanalysis.Issue
2222

2323
analyzer := &analysis.Analyzer{
24-
Name: gocycloName,
24+
Name: name,
2525
Doc: goanalysis.TheOnlyanalyzerDoc,
2626
Run: func(pass *analysis.Pass) (any, error) {
2727
issues := runGoCyclo(pass, settings)
@@ -39,7 +39,7 @@ func NewGocyclo(settings *config.GoCycloSettings) *goanalysis.Linter {
3939
}
4040

4141
return goanalysis.NewLinter(
42-
gocycloName,
42+
name,
4343
"Computes and checks the cyclomatic complexity of functions",
4444
[]*analysis.Analyzer{analyzer},
4545
nil,
@@ -68,7 +68,7 @@ func runGoCyclo(pass *analysis.Pass, settings *config.GoCycloSettings) []goanaly
6868
issues = append(issues, goanalysis.NewIssue(&result.Issue{
6969
Pos: s.Pos,
7070
Text: text,
71-
FromLinter: gocycloName,
71+
FromLinter: name,
7272
}, pass))
7373
}
7474

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package gocyclo
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/gocyclo.go renamed to pkg/golinters/gocyclo/testdata/gocyclo.go

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

55
import "net/http"

pkg/lint/lintersdb/builder_linter.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"github.com/golangci/golangci-lint/pkg/golinters/gocognit"
4040
"github.com/golangci/golangci-lint/pkg/golinters/goconst"
4141
"github.com/golangci/golangci-lint/pkg/golinters/gocritic"
42+
"github.com/golangci/golangci-lint/pkg/golinters/gocyclo"
4243
"github.com/golangci/golangci-lint/pkg/golinters/godot"
4344
"github.com/golangci/golangci-lint/pkg/golinters/gofmt"
4445
"github.com/golangci/golangci-lint/pkg/golinters/gofumpt"
@@ -294,7 +295,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
294295
WithAutoFix().
295296
WithURL("https://github.com/go-critic/go-critic"),
296297

297-
linter.NewConfig(golinters.NewGocyclo(&cfg.LintersSettings.Gocyclo)).
298+
linter.NewConfig(gocyclo.New(&cfg.LintersSettings.Gocyclo)).
298299
WithSince("v1.0.0").
299300
WithPresets(linter.PresetComplexity).
300301
WithURL("https://github.com/fzipp/gocyclo"),

0 commit comments

Comments
 (0)