Skip to content

Commit c95ec05

Browse files
ldezldez
committed
review: rename configuration packages
1 parent 6e989eb commit c95ec05

34 files changed

+334
-334
lines changed

‎pkg/commands/internal/migrate/migrate.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package migrate
22

33
import (
4-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/one"
54
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
6-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/two"
5+
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
6+
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
77
)
88

9-
func ToConfig(old *one.Config) *two.Config {
10-
return &two.Config{
9+
func ToConfig(old *versionone.Config) *versiontwo.Config {
10+
return &versiontwo.Config{
1111
Version: ptr.Pointer("2"),
1212
Linters: toLinters(old),
1313
Formatters: toFormatters(old),

‎pkg/commands/internal/migrate/migrate_formatters.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"slices"
55
"strings"
66

7-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/one"
87
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
9-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/two"
8+
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
9+
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
1010
)
1111

12-
func toFormatters(old *one.Config) two.Formatters {
12+
func toFormatters(old *versionone.Config) versiontwo.Formatters {
1313
enable, _ := ProcessEffectiveLinters(old.Linters)
1414

1515
formatterNames := onlyFormatterNames(enable)
@@ -19,23 +19,23 @@ func toFormatters(old *one.Config) two.Formatters {
1919
paths = slices.Concat(old.Issues.ExcludeFiles, old.Issues.ExcludeDirs)
2020
}
2121

22-
return two.Formatters{
22+
return versiontwo.Formatters{
2323
Enable: formatterNames,
24-
Settings: two.FormatterSettings{
24+
Settings: versiontwo.FormatterSettings{
2525
Gci: toGciSettings(old.LintersSettings.Gci),
2626
GoFmt: toGoFmtSettings(old.LintersSettings.GoFmt),
2727
GoFumpt: toGoFumptSettings(old.LintersSettings.GoFumpt),
2828
GoImports: toGoImportsSettings(old.LintersSettings.GoImports),
2929
},
30-
Exclusions: two.FormatterExclusions{
30+
Exclusions: versiontwo.FormatterExclusions{
3131
Generated: toExclusionGenerated(old.Issues.ExcludeGenerated),
3232
Paths: paths,
3333
},
3434
}
3535
}
3636

37-
func toGciSettings(old one.GciSettings) two.GciSettings {
38-
return two.GciSettings{
37+
func toGciSettings(old versionone.GciSettings) versiontwo.GciSettings {
38+
return versiontwo.GciSettings{
3939
Sections: old.Sections,
4040
NoInlineComments: old.NoInlineComments,
4141
NoPrefixComments: old.NoPrefixComments,
@@ -44,13 +44,13 @@ func toGciSettings(old one.GciSettings) two.GciSettings {
4444
}
4545
}
4646

47-
func toGoFmtSettings(old one.GoFmtSettings) two.GoFmtSettings {
48-
settings := two.GoFmtSettings{
47+
func toGoFmtSettings(old versionone.GoFmtSettings) versiontwo.GoFmtSettings {
48+
settings := versiontwo.GoFmtSettings{
4949
Simplify: old.Simplify,
5050
}
5151

5252
for _, rule := range old.RewriteRules {
53-
settings.RewriteRules = append(settings.RewriteRules, two.GoFmtRewriteRule{
53+
settings.RewriteRules = append(settings.RewriteRules, versiontwo.GoFmtRewriteRule{
5454
Pattern: rule.Pattern,
5555
Replacement: rule.Replacement,
5656
})
@@ -59,21 +59,21 @@ func toGoFmtSettings(old one.GoFmtSettings) two.GoFmtSettings {
5959
return settings
6060
}
6161

62-
func toGoFumptSettings(old one.GoFumptSettings) two.GoFumptSettings {
63-
return two.GoFumptSettings{
62+
func toGoFumptSettings(old versionone.GoFumptSettings) versiontwo.GoFumptSettings {
63+
return versiontwo.GoFumptSettings{
6464
ModulePath: old.ModulePath,
6565
ExtraRules: old.ExtraRules,
6666
}
6767
}
6868

69-
func toGoImportsSettings(old one.GoImportsSettings) two.GoImportsSettings {
69+
func toGoImportsSettings(old versionone.GoImportsSettings) versiontwo.GoImportsSettings {
7070
var localPrefixes []string
7171

7272
if ptr.Deref(old.LocalPrefixes) != "" {
7373
localPrefixes = strings.Split(ptr.Deref(old.LocalPrefixes), ",")
7474
}
7575

76-
return two.GoImportsSettings{
76+
return versiontwo.GoImportsSettings{
7777
LocalPrefixes: localPrefixes,
7878
}
7979
}

‎pkg/commands/internal/migrate/migrate_issues.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package migrate
22

33
import (
4-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/one"
5-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/two"
4+
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
5+
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
66
)
77

8-
func toIssues(old *one.Config) two.Issues {
9-
return two.Issues{
8+
func toIssues(old *versionone.Config) versiontwo.Issues {
9+
return versiontwo.Issues{
1010
MaxIssuesPerLinter: old.Issues.MaxIssuesPerLinter,
1111
MaxSameIssues: old.Issues.MaxSameIssues,
1212
UniqByLine: old.Issues.UniqByLine,

‎pkg/commands/internal/migrate/migrate_linter_names.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package migrate
33
import (
44
"slices"
55

6-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/one"
76
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
7+
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
88
)
99

1010
type LinterInfo struct {
@@ -33,7 +33,7 @@ func (l *LinterInfo) hasPresets(names []string) bool {
3333
return false
3434
}
3535

36-
func ProcessEffectiveLinters(old one.Linters) (enable, disable []string) {
36+
func ProcessEffectiveLinters(old versionone.Linters) (enable, disable []string) {
3737
switch {
3838
case ptr.Deref(old.DisableAll):
3939
return disableAllFilter(old), nil
@@ -45,7 +45,7 @@ func ProcessEffectiveLinters(old one.Linters) (enable, disable []string) {
4545
}
4646

4747
// disableAllFilter generates the value of `enable` when `disable-all` is `true`.
48-
func disableAllFilter(old one.Linters) []string {
48+
func disableAllFilter(old versionone.Linters) []string {
4949
// Note:
5050
// - disable-all + enable-all
5151
// => impossible (https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L38)
@@ -74,7 +74,7 @@ func disableAllFilter(old one.Linters) []string {
7474
}
7575

7676
// enableAllFilter generates the value of `disable` when `enable-all` is `true`.
77-
func enableAllFilter(old one.Linters) []string {
77+
func enableAllFilter(old versionone.Linters) []string {
7878
// Note:
7979
// - enable-all + disable-all
8080
// => impossible (https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L38)
@@ -109,7 +109,7 @@ func enableAllFilter(old one.Linters) []string {
109109
}
110110

111111
// defaultLintersFilter generates the values of `enable` and `disable` when using default linters.
112-
func defaultLintersFilter(old one.Linters) (enable, disable []string) {
112+
func defaultLintersFilter(old versionone.Linters) (enable, disable []string) {
113113
// Note:
114114
// - a linter cannot be inside `enable` and `disable` in the same configuration
115115
// => https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L66
@@ -161,7 +161,7 @@ func defaultLintersFilter(old one.Linters) (enable, disable []string) {
161161
}
162162

163163
// defaultLintersEnableFilter generates the value of `enable` when using default linters.
164-
func defaultLintersEnableFilter(old one.Linters, effectiveDisabled []LinterInfo) []LinterInfo {
164+
func defaultLintersEnableFilter(old versionone.Linters, effectiveDisabled []LinterInfo) []LinterInfo {
165165
// presets - slow + enable - default - [effective disable] => effective enable
166166
return removeLinters(
167167
filter(
@@ -178,7 +178,7 @@ func defaultLintersEnableFilter(old one.Linters, effectiveDisabled []LinterInfo)
178178
}
179179

180180
// defaultLintersDisableFilter generates the value of `disable` when using default linters.
181-
func defaultLintersDisableFilter(old one.Linters) []LinterInfo {
181+
func defaultLintersDisableFilter(old versionone.Linters) []LinterInfo {
182182
// (default - fast) - enable + disable => effective disable
183183
return slices.Concat(
184184
removeLinters(
@@ -731,7 +731,7 @@ func removeLinters(linters, toRemove []LinterInfo) []LinterInfo {
731731
})
732732
}
733733

734-
func allEnabled(old one.Linters, linters []LinterInfo) []LinterInfo {
734+
func allEnabled(old versionone.Linters, linters []LinterInfo) []LinterInfo {
735735
var results []LinterInfo
736736

737737
for _, linter := range linters {
@@ -746,7 +746,7 @@ func allEnabled(old one.Linters, linters []LinterInfo) []LinterInfo {
746746
return results
747747
}
748748

749-
func allDisabled(old one.Linters, linters []LinterInfo) []LinterInfo {
749+
func allDisabled(old versionone.Linters, linters []LinterInfo) []LinterInfo {
750750
var results []LinterInfo
751751

752752
for _, linter := range linters {
@@ -785,7 +785,7 @@ func mergeFilters(linter LinterInfo, fns []fnFilter) bool {
785785

786786
type fnFilter func(linter LinterInfo) bool
787787

788-
func onlyPresets(old one.Linters) fnFilter {
788+
func onlyPresets(old versionone.Linters) fnFilter {
789789
return func(linter LinterInfo) bool {
790790
return linter.hasPresets(old.Presets)
791791
}
@@ -799,7 +799,7 @@ func notDefault(linter LinterInfo) bool {
799799
return !linter.Default
800800
}
801801

802-
func keepFast(old one.Linters) fnFilter {
802+
func keepFast(old versionone.Linters) fnFilter {
803803
return func(linter LinterInfo) bool {
804804
if !ptr.Deref(old.Fast) {
805805
return true
@@ -809,7 +809,7 @@ func keepFast(old one.Linters) fnFilter {
809809
}
810810
}
811811

812-
func keepSlow(old one.Linters) fnFilter {
812+
func keepSlow(old versionone.Linters) fnFilter {
813813
return func(linter LinterInfo) bool {
814814
if !ptr.Deref(old.Fast) {
815815
return false

0 commit comments

Comments
 (0)