Skip to content

Commit aaef7fc

Browse files
committed
chore: minor changes
1 parent 45fef5d commit aaef7fc

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

pkg/lint/lintersdb/manager.go

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package lintersdb
22

33
import (
44
"os"
5+
"slices"
56
"sort"
67

78
"golang.org/x/exp/maps"
@@ -74,16 +75,13 @@ func (m *Manager) GetAllSupportedLinterConfigs() []*linter.Config {
7475

7576
func (m *Manager) GetAllLinterConfigsForPreset(p string) []*linter.Config {
7677
var ret []*linter.Config
77-
for _, lc := range m.GetAllSupportedLinterConfigs() {
78+
for _, lc := range m.linters {
7879
if lc.IsDeprecated() {
7980
continue
8081
}
8182

82-
for _, ip := range lc.InPresets {
83-
if p == ip {
84-
ret = append(ret, lc)
85-
break
86-
}
83+
if slices.Contains(lc.InPresets, p) {
84+
ret = append(ret, lc)
8785
}
8886
}
8987

@@ -134,7 +132,7 @@ func (m *Manager) GetOptimizedLinters() ([]*linter.Config, error) {
134132

135133
func (m *Manager) GetAllEnabledByDefaultLinters() []*linter.Config {
136134
var ret []*linter.Config
137-
for _, lc := range m.GetAllSupportedLinterConfigs() {
135+
for _, lc := range m.linters {
138136
if lc.EnabledByDefault {
139137
ret = append(ret, lc)
140138
}
@@ -149,12 +147,12 @@ func (m *Manager) build(enabledByDefaultLinters []*linter.Config) map[string]*li
149147

150148
resultLintersSet := map[string]*linter.Config{}
151149
switch {
150+
case m.cfg.Linters.DisableAll:
151+
// no default linters
152152
case len(m.cfg.Linters.Presets) != 0:
153-
break // imply --disable-all
153+
// imply --disable-all
154154
case m.cfg.Linters.EnableAll:
155-
resultLintersSet = linterConfigsToMap(m.GetAllSupportedLinterConfigs())
156-
case m.cfg.Linters.DisableAll:
157-
break
155+
resultLintersSet = linterConfigsToMap(m.linters)
158156
default:
159157
resultLintersSet = linterConfigsToMap(enabledByDefaultLinters)
160158
}

0 commit comments

Comments
 (0)