Skip to content

Commit 87a35e6

Browse files
ldezldez
authored
dev: organize golinters package (#4578)
1 parent 085ac85 commit 87a35e6

File tree

132 files changed

+230
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+230
-201
lines changed

‎.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ issues:
186186
- path: pkg/golinters/gofumpt.go
187187
linters: [staticcheck]
188188
text: "SA1019: settings.LangVersion is deprecated: use the global `run.go` instead."
189-
- path: pkg/golinters/staticcheck_common.go
189+
- path: pkg/golinters/internal/staticcheck_common.go
190190
linters: [staticcheck]
191191
text: "SA1019: settings.GoVersion is deprecated: use the global `run.go` instead."
192192
- path: pkg/lint/lintersdb/manager.go

‎pkg/commands/run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"github.com/golangci/golangci-lint/pkg/config"
3333
"github.com/golangci/golangci-lint/pkg/exitcodes"
3434
"github.com/golangci/golangci-lint/pkg/fsutils"
35-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load"
35+
"github.com/golangci/golangci-lint/pkg/goanalysis/load"
3636
"github.com/golangci/golangci-lint/pkg/goutil"
3737
"github.com/golangci/golangci-lint/pkg/lint"
3838
"github.com/golangci/golangci-lint/pkg/lint/linter"

‎pkg/golinters/goanalysis/errors.go renamed to ‎pkg/goanalysis/errors.go

File renamed without changes.

‎pkg/golinters/goanalysis/issue.go renamed to ‎pkg/goanalysis/issue.go

File renamed without changes.

‎pkg/golinters/goanalysis/linter.go renamed to ‎pkg/goanalysis/linter.go

File renamed without changes.

‎pkg/golinters/goanalysis/linter_test.go renamed to ‎pkg/goanalysis/linter_test.go

File renamed without changes.

‎pkg/golinters/goanalysis/load/guard.go renamed to ‎pkg/goanalysis/load/guard.go

File renamed without changes.

‎pkg/golinters/goanalysis/metalinter.go renamed to ‎pkg/goanalysis/metalinter.go

File renamed without changes.

‎pkg/golinters/goanalysis/runner.go renamed to ‎pkg/goanalysis/runner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/golangci/golangci-lint/internal/errorutil"
2525
"github.com/golangci/golangci-lint/internal/pkgcache"
26-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load"
26+
"github.com/golangci/golangci-lint/pkg/goanalysis/load"
2727
"github.com/golangci/golangci-lint/pkg/logutils"
2828
"github.com/golangci/golangci-lint/pkg/timeutils"
2929
)

‎pkg/golinters/goanalysis/runner_action.go renamed to ‎pkg/goanalysis/runner_action.go

File renamed without changes.

‎pkg/golinters/goanalysis/runner_facts.go renamed to ‎pkg/goanalysis/runner_facts.go

File renamed without changes.

‎pkg/golinters/goanalysis/runner_loadingpackage.go renamed to ‎pkg/goanalysis/runner_loadingpackage.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"golang.org/x/tools/go/gcexportdata"
1616
"golang.org/x/tools/go/packages"
1717

18-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load"
18+
"github.com/golangci/golangci-lint/pkg/goanalysis/load"
1919
"github.com/golangci/golangci-lint/pkg/logutils"
2020
)
2121

‎pkg/golinters/goanalysis/runners.go renamed to ‎pkg/goanalysis/runners.go

File renamed without changes.

‎pkg/golinters/asasalint.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import (
55
"golang.org/x/tools/go/analysis"
66

77
"github.com/golangci/golangci-lint/pkg/config"
8-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
8+
"github.com/golangci/golangci-lint/pkg/goanalysis"
9+
"github.com/golangci/golangci-lint/pkg/golinters/internal"
910
)
1011

1112
func NewAsasalint(setting *config.AsasalintSettings) *goanalysis.Linter {
@@ -18,7 +19,7 @@ func NewAsasalint(setting *config.AsasalintSettings) *goanalysis.Linter {
1819

1920
a, err := asasalint.NewAnalyzer(cfg)
2021
if err != nil {
21-
linterLogger.Fatalf("asasalint: create analyzer: %v", err)
22+
internal.LinterLogger.Fatalf("asasalint: create analyzer: %v", err)
2223
}
2324

2425
return goanalysis.NewLinter(

‎pkg/golinters/asciicheck.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/tdakkota/asciicheck"
55
"golang.org/x/tools/go/analysis"
66

7-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
7+
"github.com/golangci/golangci-lint/pkg/goanalysis"
88
)
99

1010
func NewAsciicheck() *goanalysis.Linter {

‎pkg/golinters/bidichk.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"golang.org/x/tools/go/analysis"
88

99
"github.com/golangci/golangci-lint/pkg/config"
10-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
10+
"github.com/golangci/golangci-lint/pkg/goanalysis"
1111
)
1212

1313
func NewBiDiChk(cfg *config.BiDiChkSettings) *goanalysis.Linter {

‎pkg/golinters/bodyclose.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/timakin/bodyclose/passes/bodyclose"
55
"golang.org/x/tools/go/analysis"
66

7-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
7+
"github.com/golangci/golangci-lint/pkg/goanalysis"
88
)
99

1010
func NewBodyclose() *goanalysis.Linter {

‎pkg/golinters/commons.go

-6
This file was deleted.

‎pkg/golinters/containedctx.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/sivchari/containedctx"
55
"golang.org/x/tools/go/analysis"
66

7-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
7+
"github.com/golangci/golangci-lint/pkg/goanalysis"
88
)
99

1010
func NewContainedCtx() *goanalysis.Linter {

‎pkg/golinters/contextcheck.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/kkHAIKE/contextcheck"
55
"golang.org/x/tools/go/analysis"
66

7-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
7+
"github.com/golangci/golangci-lint/pkg/goanalysis"
88
"github.com/golangci/golangci-lint/pkg/lint/linter"
99
)
1010

‎pkg/golinters/copyloopvar.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"golang.org/x/tools/go/analysis"
66

77
"github.com/golangci/golangci-lint/pkg/config"
8-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
8+
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

1111
func NewCopyLoopVar(settings *config.CopyLoopVarSettings) *goanalysis.Linter {

‎pkg/golinters/cyclop.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"golang.org/x/tools/go/analysis"
66

77
"github.com/golangci/golangci-lint/pkg/config"
8-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
8+
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

1111
func NewCyclop(settings *config.Cyclop) *goanalysis.Linter {

‎pkg/golinters/decorder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"golang.org/x/tools/go/analysis"
88

99
"github.com/golangci/golangci-lint/pkg/config"
10-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
10+
"github.com/golangci/golangci-lint/pkg/goanalysis"
1111
)
1212

1313
func NewDecorder(settings *config.DecorderSettings) *goanalysis.Linter {

‎pkg/golinters/depguard.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"golang.org/x/tools/go/analysis"
66

77
"github.com/golangci/golangci-lint/pkg/config"
8-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
8+
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
"github.com/golangci/golangci-lint/pkg/lint/linter"
1010
)
1111

‎pkg/golinters/dogsled.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"golang.org/x/tools/go/analysis"
1010

1111
"github.com/golangci/golangci-lint/pkg/config"
12-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
12+
"github.com/golangci/golangci-lint/pkg/goanalysis"
1313
"github.com/golangci/golangci-lint/pkg/lint/linter"
1414
"github.com/golangci/golangci-lint/pkg/result"
1515
)

‎pkg/golinters/dupl.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import (
1010

1111
"github.com/golangci/golangci-lint/pkg/config"
1212
"github.com/golangci/golangci-lint/pkg/fsutils"
13-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
13+
"github.com/golangci/golangci-lint/pkg/goanalysis"
14+
"github.com/golangci/golangci-lint/pkg/golinters/internal"
1415
"github.com/golangci/golangci-lint/pkg/lint/linter"
1516
"github.com/golangci/golangci-lint/pkg/result"
1617
)
@@ -53,7 +54,7 @@ func NewDupl(settings *config.DuplSettings) *goanalysis.Linter {
5354
}
5455

5556
func runDupl(pass *analysis.Pass, settings *config.DuplSettings) ([]goanalysis.Issue, error) {
56-
fileNames := getFileNames(pass)
57+
fileNames := internal.GetFileNames(pass)
5758

5859
issues, err := duplAPI.Run(fileNames, settings.Threshold)
5960
if err != nil {
@@ -75,7 +76,7 @@ func runDupl(pass *analysis.Pass, settings *config.DuplSettings) ([]goanalysis.I
7576
dupl := fmt.Sprintf("%s:%d-%d", toFilename, i.To.LineStart(), i.To.LineEnd())
7677
text := fmt.Sprintf("%d-%d lines are duplicate of %s",
7778
i.From.LineStart(), i.From.LineEnd(),
78-
formatCode(dupl, nil))
79+
internal.FormatCode(dupl, nil))
7980

8081
res = append(res, goanalysis.NewIssue(&result.Issue{
8182
Pos: token.Position{

‎pkg/golinters/dupword.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"golang.org/x/tools/go/analysis"
88

99
"github.com/golangci/golangci-lint/pkg/config"
10-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
10+
"github.com/golangci/golangci-lint/pkg/goanalysis"
1111
)
1212

1313
func NewDupWord(setting *config.DupWordSettings) *goanalysis.Linter {

‎pkg/golinters/durationcheck.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/charithe/durationcheck"
55
"golang.org/x/tools/go/analysis"
66

7-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
7+
"github.com/golangci/golangci-lint/pkg/goanalysis"
88
)
99

1010
func NewDurationCheck() *goanalysis.Linter {

‎pkg/golinters/errcheck.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import (
1616

1717
"github.com/golangci/golangci-lint/pkg/config"
1818
"github.com/golangci/golangci-lint/pkg/fsutils"
19-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
19+
"github.com/golangci/golangci-lint/pkg/goanalysis"
20+
"github.com/golangci/golangci-lint/pkg/golinters/internal"
2021
"github.com/golangci/golangci-lint/pkg/lint/linter"
2122
"github.com/golangci/golangci-lint/pkg/result"
2223
)
@@ -94,7 +95,7 @@ func runErrCheck(lintCtx *linter.Context, pass *analysis.Pass, checker *errcheck
9495
code = err.FuncName
9596
}
9697

97-
text = fmt.Sprintf("Error return value of %s is not checked", formatCode(code, lintCtx.Cfg))
98+
text = fmt.Sprintf("Error return value of %s is not checked", internal.FormatCode(code, lintCtx.Cfg))
9899
}
99100

100101
issues[i] = goanalysis.NewIssue(

‎pkg/golinters/errchkjson.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"golang.org/x/tools/go/analysis"
66

77
"github.com/golangci/golangci-lint/pkg/config"
8-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
8+
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

1111
func NewErrChkJSON(cfg *config.ErrChkJSONSettings) *goanalysis.Linter {

‎pkg/golinters/errname.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/Antonboom/errname/pkg/analyzer"
55
"golang.org/x/tools/go/analysis"
66

7-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
7+
"github.com/golangci/golangci-lint/pkg/goanalysis"
88
)
99

1010
func NewErrName() *goanalysis.Linter {

‎pkg/golinters/errorlint.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"golang.org/x/tools/go/analysis"
66

77
"github.com/golangci/golangci-lint/pkg/config"
8-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
8+
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

1111
func NewErrorLint(cfg *config.ErrorLintSettings) *goanalysis.Linter {

‎pkg/golinters/execinquery.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/lufeee/execinquery"
55
"golang.org/x/tools/go/analysis"
66

7-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
7+
"github.com/golangci/golangci-lint/pkg/goanalysis"
88
)
99

1010
func NewExecInQuery() *goanalysis.Linter {

‎pkg/golinters/exhaustive.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"golang.org/x/tools/go/analysis"
66

77
"github.com/golangci/golangci-lint/pkg/config"
8-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
8+
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

1111
func NewExhaustive(settings *config.ExhaustiveSettings) *goanalysis.Linter {

‎pkg/golinters/exhaustruct.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import (
55
"golang.org/x/tools/go/analysis"
66

77
"github.com/golangci/golangci-lint/pkg/config"
8-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
8+
"github.com/golangci/golangci-lint/pkg/goanalysis"
9+
"github.com/golangci/golangci-lint/pkg/golinters/internal"
910
)
1011

1112
func NewExhaustruct(settings *config.ExhaustructSettings) *goanalysis.Linter {
@@ -17,7 +18,7 @@ func NewExhaustruct(settings *config.ExhaustructSettings) *goanalysis.Linter {
1718

1819
a, err := analyzer.NewAnalyzer(include, exclude)
1920
if err != nil {
20-
linterLogger.Fatalf("exhaustruct configuration: %v", err)
21+
internal.LinterLogger.Fatalf("exhaustruct configuration: %v", err)
2122
}
2223

2324
return goanalysis.NewLinter(

‎pkg/golinters/exportloopref.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/kyoh86/exportloopref"
55
"golang.org/x/tools/go/analysis"
66

7-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
7+
"github.com/golangci/golangci-lint/pkg/goanalysis"
88
)
99

1010
func NewExportLoopRef() *goanalysis.Linter {

‎pkg/golinters/forbidigo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"golang.org/x/tools/go/analysis"
99

1010
"github.com/golangci/golangci-lint/pkg/config"
11-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
11+
"github.com/golangci/golangci-lint/pkg/goanalysis"
1212
"github.com/golangci/golangci-lint/pkg/lint/linter"
1313
"github.com/golangci/golangci-lint/pkg/logutils"
1414
"github.com/golangci/golangci-lint/pkg/result"

‎pkg/golinters/forcetypeassert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/gostaticanalysis/forcetypeassert"
55
"golang.org/x/tools/go/analysis"
66

7-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
7+
"github.com/golangci/golangci-lint/pkg/goanalysis"
88
)
99

1010
func NewForceTypeAssert() *goanalysis.Linter {

‎pkg/golinters/funlen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"golang.org/x/tools/go/analysis"
1010

1111
"github.com/golangci/golangci-lint/pkg/config"
12-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
12+
"github.com/golangci/golangci-lint/pkg/goanalysis"
1313
"github.com/golangci/golangci-lint/pkg/lint/linter"
1414
"github.com/golangci/golangci-lint/pkg/result"
1515
)

‎pkg/golinters/gci.go

+11-10
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import (
1414
"golang.org/x/tools/go/analysis"
1515

1616
"github.com/golangci/golangci-lint/pkg/config"
17-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
17+
"github.com/golangci/golangci-lint/pkg/goanalysis"
18+
"github.com/golangci/golangci-lint/pkg/golinters/internal"
1819
"github.com/golangci/golangci-lint/pkg/lint/linter"
1920
)
2021

@@ -48,7 +49,7 @@ func NewGci(settings *config.GciSettings) *goanalysis.Linter {
4849
var err error
4950
cfg, err = rawCfg.Parse()
5051
if err != nil {
51-
linterLogger.Fatalf("gci: configuration parsing: %v", err)
52+
internal.LinterLogger.Fatalf("gci: configuration parsing: %v", err)
5253
}
5354
}
5455

@@ -82,7 +83,7 @@ func NewGci(settings *config.GciSettings) *goanalysis.Linter {
8283
}
8384

8485
func runGci(pass *analysis.Pass, lintCtx *linter.Context, cfg *gcicfg.Config, lock *sync.Mutex) ([]goanalysis.Issue, error) {
85-
fileNames := getFileNames(pass)
86+
fileNames := internal.GetFileNames(pass)
8687

8788
var diffs []string
8889
err := diffFormattedFilesToArray(fileNames, *cfg, &diffs, lock)
@@ -97,7 +98,7 @@ func runGci(pass *analysis.Pass, lintCtx *linter.Context, cfg *gcicfg.Config, lo
9798
continue
9899
}
99100

100-
is, err := extractIssuesFromPatch(diff, lintCtx, gciName)
101+
is, err := internal.ExtractIssuesFromPatch(diff, lintCtx, gciName, getIssuedTextGci)
101102
if err != nil {
102103
return nil, fmt.Errorf("can't extract issues from gci diff output %s: %w", diff, err)
103104
}
@@ -129,27 +130,27 @@ func diffFormattedFilesToArray(paths []string, cfg gcicfg.Config, diffs *[]strin
129130
})
130131
}
131132

132-
func getErrorTextForGci(settings config.GciSettings) string {
133+
func getIssuedTextGci(settings *config.LintersSettings) string {
133134
text := "File is not `gci`-ed"
134135

135-
hasOptions := settings.SkipGenerated || len(settings.Sections) > 0
136+
hasOptions := settings.Gci.SkipGenerated || len(settings.Gci.Sections) > 0
136137
if !hasOptions {
137138
return text
138139
}
139140

140141
text += " with"
141142

142-
if settings.SkipGenerated {
143+
if settings.Gci.SkipGenerated {
143144
text += " --skip-generated"
144145
}
145146

146-
if len(settings.Sections) > 0 {
147-
for _, section := range settings.Sections {
147+
if len(settings.Gci.Sections) > 0 {
148+
for _, section := range settings.Gci.Sections {
148149
text += " -s " + section
149150
}
150151
}
151152

152-
if settings.CustomOrder {
153+
if settings.Gci.CustomOrder {
153154
text += " --custom-order"
154155
}
155156

‎pkg/golinters/ginkgolinter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"golang.org/x/tools/go/analysis"
77

88
"github.com/golangci/golangci-lint/pkg/config"
9-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
9+
"github.com/golangci/golangci-lint/pkg/goanalysis"
1010
)
1111

1212
func NewGinkgoLinter(settings *config.GinkgoLinterSettings) *goanalysis.Linter {

0 commit comments

Comments
 (0)