@@ -26,8 +26,7 @@ type Linters struct {
26
26
func (l * Linters ) Validate () error {
27
27
validators := []func () error {
28
28
l .Exclusions .Validate ,
29
- l .validateNoFormattersEnabled ,
30
- l .validateNoFormattersDisabled ,
29
+ l .validateNoFormatters ,
31
30
}
32
31
33
32
for _ , v := range validators {
@@ -39,18 +38,8 @@ func (l *Linters) Validate() error {
39
38
return nil
40
39
}
41
40
42
- func (l * Linters ) validateNoFormattersEnabled () error {
43
- for _ , n := range l .Enable {
44
- if slices .Contains (getAllFormatterNames (), n ) {
45
- return fmt .Errorf ("%s is a formatter" , n )
46
- }
47
- }
48
-
49
- return nil
50
- }
51
-
52
- func (l * Linters ) validateNoFormattersDisabled () error {
53
- for _ , n := range l .Disable {
41
+ func (l * Linters ) validateNoFormatters () error {
42
+ for _ , n := range slices .Concat (l .Enable , l .Disable ) {
54
43
if slices .Contains (getAllFormatterNames (), n ) {
55
44
return fmt .Errorf ("%s is a formatter" , n )
56
45
}
@@ -60,5 +49,5 @@ func (l *Linters) validateNoFormattersDisabled() error {
60
49
}
61
50
62
51
func getAllFormatterNames () []string {
63
- return []string {"gci" , "gofmt" , "gofumpt" , "goimports" }
52
+ return []string {"gci" , "gofmt" , "gofumpt" , "goimports" , "golines" }
64
53
}
0 commit comments