@@ -26,8 +26,7 @@ type Linters struct {
2626func (l * Linters ) Validate () error {
2727 validators := []func () error {
2828 l .Exclusions .Validate ,
29- l .validateNoFormattersEnabled ,
30- l .validateNoFormattersDisabled ,
29+ l .validateNoFormatters ,
3130 }
3231
3332 for _ , v := range validators {
@@ -39,18 +38,8 @@ func (l *Linters) Validate() error {
3938 return nil
4039}
4140
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 ) {
5443 if slices .Contains (getAllFormatterNames (), n ) {
5544 return fmt .Errorf ("%s is a formatter" , n )
5645 }
@@ -60,5 +49,5 @@ func (l *Linters) validateNoFormattersDisabled() error {
6049}
6150
6251func getAllFormatterNames () []string {
63- return []string {"gci" , "gofmt" , "gofumpt" , "goimports" }
52+ return []string {"gci" , "gofmt" , "gofumpt" , "goimports" , "golines" }
6453}
0 commit comments