Skip to content

Commit 9921355

Browse files
alexandearalexandear
authored
dev: refactor linter constructors for consistency (#5173)
1 parent bab25b4 commit 9921355

File tree

13 files changed

+103
-103
lines changed

13 files changed

+103
-103
lines changed

‎pkg/golinters/asasalint/asasalint.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
"github.com/golangci/golangci-lint/pkg/golinters/internal"
1010
)
1111

12-
func New(setting *config.AsasalintSettings) *goanalysis.Linter {
12+
func New(settings *config.AsasalintSettings) *goanalysis.Linter {
1313
cfg := asasalint.LinterSetting{}
14-
if setting != nil {
15-
cfg.Exclude = setting.Exclude
16-
cfg.NoBuiltinExclusions = !setting.UseBuiltinExclusions
17-
cfg.IgnoreTest = setting.IgnoreTest
14+
if settings != nil {
15+
cfg.Exclude = settings.Exclude
16+
cfg.NoBuiltinExclusions = !settings.UseBuiltinExclusions
17+
cfg.IgnoreTest = settings.IgnoreTest
1818
}
1919

2020
a, err := asasalint.NewAnalyzer(cfg)

‎pkg/golinters/bidichk/bidichk.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -10,42 +10,42 @@ import (
1010
"github.com/golangci/golangci-lint/pkg/goanalysis"
1111
)
1212

13-
func New(cfg *config.BiDiChkSettings) *goanalysis.Linter {
13+
func New(settings *config.BiDiChkSettings) *goanalysis.Linter {
1414
a := bidichk.NewAnalyzer()
1515

16-
cfgMap := map[string]map[string]any{}
17-
if cfg != nil {
16+
cfg := map[string]map[string]any{}
17+
if settings != nil {
1818
var opts []string
1919

20-
if cfg.LeftToRightEmbedding {
20+
if settings.LeftToRightEmbedding {
2121
opts = append(opts, "LEFT-TO-RIGHT-EMBEDDING")
2222
}
23-
if cfg.RightToLeftEmbedding {
23+
if settings.RightToLeftEmbedding {
2424
opts = append(opts, "RIGHT-TO-LEFT-EMBEDDING")
2525
}
26-
if cfg.PopDirectionalFormatting {
26+
if settings.PopDirectionalFormatting {
2727
opts = append(opts, "POP-DIRECTIONAL-FORMATTING")
2828
}
29-
if cfg.LeftToRightOverride {
29+
if settings.LeftToRightOverride {
3030
opts = append(opts, "LEFT-TO-RIGHT-OVERRIDE")
3131
}
32-
if cfg.RightToLeftOverride {
32+
if settings.RightToLeftOverride {
3333
opts = append(opts, "RIGHT-TO-LEFT-OVERRIDE")
3434
}
35-
if cfg.LeftToRightIsolate {
35+
if settings.LeftToRightIsolate {
3636
opts = append(opts, "LEFT-TO-RIGHT-ISOLATE")
3737
}
38-
if cfg.RightToLeftIsolate {
38+
if settings.RightToLeftIsolate {
3939
opts = append(opts, "RIGHT-TO-LEFT-ISOLATE")
4040
}
41-
if cfg.FirstStrongIsolate {
41+
if settings.FirstStrongIsolate {
4242
opts = append(opts, "FIRST-STRONG-ISOLATE")
4343
}
44-
if cfg.PopDirectionalIsolate {
44+
if settings.PopDirectionalIsolate {
4545
opts = append(opts, "POP-DIRECTIONAL-ISOLATE")
4646
}
4747

48-
cfgMap[a.Name] = map[string]any{
48+
cfg[a.Name] = map[string]any{
4949
"disallowed-runes": strings.Join(opts, ","),
5050
}
5151
}
@@ -54,6 +54,6 @@ func New(cfg *config.BiDiChkSettings) *goanalysis.Linter {
5454
a.Name,
5555
"Checks for dangerous unicode character sequences",
5656
[]*analysis.Analyzer{a},
57-
cfgMap,
57+
cfg,
5858
).WithLoadMode(goanalysis.LoadModeSyntax)
5959
}

‎pkg/golinters/dupword/dupword.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ import (
1010
"github.com/golangci/golangci-lint/pkg/goanalysis"
1111
)
1212

13-
func New(setting *config.DupWordSettings) *goanalysis.Linter {
13+
func New(settings *config.DupWordSettings) *goanalysis.Linter {
1414
a := dupword.NewAnalyzer()
1515

16-
cfgMap := map[string]map[string]any{}
17-
if setting != nil {
18-
cfgMap[a.Name] = map[string]any{
19-
"keyword": strings.Join(setting.Keywords, ","),
20-
"ignore": strings.Join(setting.Ignore, ","),
16+
cfg := map[string]map[string]any{}
17+
if settings != nil {
18+
cfg[a.Name] = map[string]any{
19+
"keyword": strings.Join(settings.Keywords, ","),
20+
"ignore": strings.Join(settings.Ignore, ","),
2121
}
2222
}
2323

2424
return goanalysis.NewLinter(
2525
a.Name,
2626
"checks for duplicate words in the source code",
2727
[]*analysis.Analyzer{a},
28-
cfgMap,
28+
cfg,
2929
).WithLoadMode(goanalysis.LoadModeSyntax)
3030
}

‎pkg/golinters/errchkjson/errchkjson.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ import (
88
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

11-
func New(cfg *config.ErrChkJSONSettings) *goanalysis.Linter {
11+
func New(settings *config.ErrChkJSONSettings) *goanalysis.Linter {
1212
a := errchkjson.NewAnalyzer()
1313

14-
cfgMap := map[string]map[string]any{}
15-
cfgMap[a.Name] = map[string]any{
14+
cfg := map[string]map[string]any{}
15+
cfg[a.Name] = map[string]any{
1616
"omit-safe": true,
1717
}
18-
if cfg != nil {
19-
cfgMap[a.Name] = map[string]any{
20-
"omit-safe": !cfg.CheckErrorFreeEncoding,
21-
"report-no-exported": cfg.ReportNoExported,
18+
if settings != nil {
19+
cfg[a.Name] = map[string]any{
20+
"omit-safe": !settings.CheckErrorFreeEncoding,
21+
"report-no-exported": settings.ReportNoExported,
2222
}
2323
}
2424

2525
return goanalysis.NewLinter(
2626
a.Name,
2727
a.Doc,
2828
[]*analysis.Analyzer{a},
29-
cfgMap,
29+
cfg,
3030
).WithLoadMode(goanalysis.LoadModeTypesInfo)
3131
}

‎pkg/golinters/errorlint/errorlint.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@ import (
88
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

11-
func New(cfg *config.ErrorLintSettings) *goanalysis.Linter {
11+
func New(settings *config.ErrorLintSettings) *goanalysis.Linter {
1212
var opts []errorlint.Option
1313

14-
if cfg != nil {
15-
ae := toAllowPairs(cfg.AllowedErrors)
14+
if settings != nil {
15+
ae := toAllowPairs(settings.AllowedErrors)
1616
if len(ae) > 0 {
1717
opts = append(opts, errorlint.WithAllowedErrors(ae))
1818
}
1919

20-
aew := toAllowPairs(cfg.AllowedErrorsWildcard)
20+
aew := toAllowPairs(settings.AllowedErrorsWildcard)
2121
if len(aew) > 0 {
2222
opts = append(opts, errorlint.WithAllowedWildcard(aew))
2323
}
2424
}
2525

2626
a := errorlint.NewAnalyzer(opts...)
2727

28-
cfgMap := map[string]map[string]any{}
28+
cfg := map[string]map[string]any{}
2929

30-
if cfg != nil {
31-
cfgMap[a.Name] = map[string]any{
32-
"errorf": cfg.Errorf,
33-
"errorf-multi": cfg.ErrorfMulti,
34-
"asserts": cfg.Asserts,
35-
"comparison": cfg.Comparison,
30+
if settings != nil {
31+
cfg[a.Name] = map[string]any{
32+
"errorf": settings.Errorf,
33+
"errorf-multi": settings.ErrorfMulti,
34+
"asserts": settings.Asserts,
35+
"comparison": settings.Comparison,
3636
}
3737
}
3838

@@ -41,7 +41,7 @@ func New(cfg *config.ErrorLintSettings) *goanalysis.Linter {
4141
"errorlint is a linter for that can be used to find code "+
4242
"that will cause problems with the error wrapping scheme introduced in Go 1.13.",
4343
[]*analysis.Analyzer{a},
44-
cfgMap,
44+
cfg,
4545
).WithLoadMode(goanalysis.LoadModeTypesInfo)
4646
}
4747

‎pkg/golinters/gosmopolitan/gosmopolitan.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ import (
1010
"github.com/golangci/golangci-lint/pkg/goanalysis"
1111
)
1212

13-
func New(s *config.GosmopolitanSettings) *goanalysis.Linter {
13+
func New(settings *config.GosmopolitanSettings) *goanalysis.Linter {
1414
a := gosmopolitan.NewAnalyzer()
1515

16-
cfgMap := map[string]map[string]any{}
17-
if s != nil {
18-
cfgMap[a.Name] = map[string]any{
19-
"allowtimelocal": s.AllowTimeLocal,
20-
"escapehatches": strings.Join(s.EscapeHatches, ","),
21-
"lookattests": !s.IgnoreTests,
22-
"watchforscripts": strings.Join(s.WatchForScripts, ","),
16+
cfg := map[string]map[string]any{}
17+
if settings != nil {
18+
cfg[a.Name] = map[string]any{
19+
"allowtimelocal": settings.AllowTimeLocal,
20+
"escapehatches": strings.Join(settings.EscapeHatches, ","),
21+
"lookattests": !settings.IgnoreTests,
22+
"watchforscripts": strings.Join(settings.WatchForScripts, ","),
2323
}
2424
}
2525

2626
return goanalysis.NewLinter(
2727
a.Name,
2828
a.Doc,
2929
[]*analysis.Analyzer{a},
30-
cfgMap,
30+
cfg,
3131
).WithLoadMode(goanalysis.LoadModeTypesInfo)
3232
}

‎pkg/golinters/grouper/grouper.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
func New(settings *config.GrouperSettings) *goanalysis.Linter {
1212
a := grouper.New()
1313

14-
linterCfg := map[string]map[string]any{}
14+
cfg := map[string]map[string]any{}
1515
if settings != nil {
16-
linterCfg[a.Name] = map[string]any{
16+
cfg[a.Name] = map[string]any{
1717
"const-require-single-const": settings.ConstRequireSingleConst,
1818
"const-require-grouping": settings.ConstRequireGrouping,
1919
"import-require-single-import": settings.ImportRequireSingleImport,
@@ -29,6 +29,6 @@ func New(settings *config.GrouperSettings) *goanalysis.Linter {
2929
a.Name,
3030
"Analyze expression groups.",
3131
[]*analysis.Analyzer{a},
32-
linterCfg,
32+
cfg,
3333
).WithLoadMode(goanalysis.LoadModeSyntax)
3434
}

‎pkg/golinters/maintidx/maintidx.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ import (
88
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

11-
func New(cfg *config.MaintIdxSettings) *goanalysis.Linter {
11+
func New(settings *config.MaintIdxSettings) *goanalysis.Linter {
1212
analyzer := maintidx.Analyzer
1313

14-
cfgMap := map[string]map[string]any{
14+
cfg := map[string]map[string]any{
1515
analyzer.Name: {"under": 20},
1616
}
1717

18-
if cfg != nil {
19-
cfgMap[analyzer.Name] = map[string]any{
20-
"under": cfg.Under,
18+
if settings != nil {
19+
cfg[analyzer.Name] = map[string]any{
20+
"under": settings.Under,
2121
}
2222
}
2323

2424
return goanalysis.NewLinter(
2525
analyzer.Name,
2626
analyzer.Doc,
2727
[]*analysis.Analyzer{analyzer},
28-
cfgMap,
28+
cfg,
2929
).WithLoadMode(goanalysis.LoadModeSyntax)
3030
}

‎pkg/golinters/musttag/musttag.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

11-
func New(setting *config.MustTagSettings) *goanalysis.Linter {
11+
func New(settings *config.MustTagSettings) *goanalysis.Linter {
1212
var funcs []musttag.Func
1313

14-
if setting != nil {
15-
for _, fn := range setting.Functions {
14+
if settings != nil {
15+
for _, fn := range settings.Functions {
1616
funcs = append(funcs, musttag.Func{
1717
Name: fn.Name,
1818
Tag: fn.Tag,

‎pkg/golinters/nilnil/nilnil.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ import (
1111
func New(settings *config.NilNilSettings) *goanalysis.Linter {
1212
a := analyzer.New()
1313

14-
cfgMap := make(map[string]map[string]any)
14+
cfg := make(map[string]map[string]any)
1515
if settings != nil {
16-
cfgMap[a.Name] = map[string]any{
16+
cfg[a.Name] = map[string]any{
1717
"detect-opposite": settings.DetectOpposite,
1818
}
1919
if len(settings.CheckedTypes) != 0 {
20-
cfgMap[a.Name]["checked-types"] = settings.CheckedTypes
20+
cfg[a.Name]["checked-types"] = settings.CheckedTypes
2121
}
2222
}
2323

2424
return goanalysis.NewLinter(
2525
a.Name,
2626
a.Doc,
2727
[]*analysis.Analyzer{a},
28-
cfgMap,
28+
cfg,
2929
).
3030
WithLoadMode(goanalysis.LoadModeTypesInfo)
3131
}

‎pkg/golinters/testpackage/testpackage.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ import (
1010
"github.com/golangci/golangci-lint/pkg/goanalysis"
1111
)
1212

13-
func New(cfg *config.TestpackageSettings) *goanalysis.Linter {
13+
func New(settings *config.TestpackageSettings) *goanalysis.Linter {
1414
a := testpackage.NewAnalyzer()
1515

16-
var settings map[string]map[string]any
17-
if cfg != nil {
18-
settings = map[string]map[string]any{
16+
var cfg map[string]map[string]any
17+
if settings != nil {
18+
cfg = map[string]map[string]any{
1919
a.Name: {
20-
testpackage.SkipRegexpFlagName: cfg.SkipRegexp,
21-
testpackage.AllowPackagesFlagName: strings.Join(cfg.AllowPackages, ","),
20+
testpackage.SkipRegexpFlagName: settings.SkipRegexp,
21+
testpackage.AllowPackagesFlagName: strings.Join(settings.AllowPackages, ","),
2222
},
2323
}
2424
}
2525

26-
return goanalysis.NewLinter(a.Name, a.Doc, []*analysis.Analyzer{a}, settings).
26+
return goanalysis.NewLinter(a.Name, a.Doc, []*analysis.Analyzer{a}, cfg).
2727
WithLoadMode(goanalysis.LoadModeSyntax)
2828
}

‎pkg/golinters/thelper/thelper.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/golangci/golangci-lint/pkg/golinters/internal"
1313
)
1414

15-
func New(cfg *config.ThelperSettings) *goanalysis.Linter {
15+
func New(settings *config.ThelperSettings) *goanalysis.Linter {
1616
a := analyzer.NewAnalyzer()
1717

1818
opts := map[string]struct{}{
@@ -33,11 +33,11 @@ func New(cfg *config.ThelperSettings) *goanalysis.Linter {
3333
"tb_first": {},
3434
}
3535

36-
if cfg != nil {
37-
applyTHelperOptions(cfg.Test, "t_", opts)
38-
applyTHelperOptions(cfg.Fuzz, "f_", opts)
39-
applyTHelperOptions(cfg.Benchmark, "b_", opts)
40-
applyTHelperOptions(cfg.TB, "tb_", opts)
36+
if settings != nil {
37+
applyTHelperOptions(settings.Test, "t_", opts)
38+
applyTHelperOptions(settings.Fuzz, "f_", opts)
39+
applyTHelperOptions(settings.Benchmark, "b_", opts)
40+
applyTHelperOptions(settings.TB, "tb_", opts)
4141
}
4242

4343
if len(opts) == 0 {
@@ -46,7 +46,7 @@ func New(cfg *config.ThelperSettings) *goanalysis.Linter {
4646

4747
args := maps.Keys(opts)
4848

49-
cfgMap := map[string]map[string]any{
49+
cfg := map[string]map[string]any{
5050
a.Name: {
5151
"checks": strings.Join(args, ","),
5252
},
@@ -56,7 +56,7 @@ func New(cfg *config.ThelperSettings) *goanalysis.Linter {
5656
a.Name,
5757
a.Doc,
5858
[]*analysis.Analyzer{a},
59-
cfgMap,
59+
cfg,
6060
).WithLoadMode(goanalysis.LoadModeTypesInfo)
6161
}
6262

0 commit comments

Comments
 (0)