Skip to content

Commit fae2f9f

Browse files
committed
chore: add flag sets
1 parent 83b1cf3 commit fae2f9f

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

pkg/commands/flagsets.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ func setupRunFlagSet(v *viper.Viper, fs *pflag.FlagSet) {
4848
internal.AddFlagAndBind(v, fs, fs.Duration, "timeout", "run.timeout", defaultTimeout, color.GreenString("Timeout for total work"))
4949

5050
internal.AddFlagAndBind(v, fs, fs.Bool, "tests", "run.tests", true, color.GreenString("Analyze tests (*_test.go)"))
51+
52+
fs.StringSlice("skip-files", nil, color.GreenString("Regexps of files to skip")) // Hack see Loader.applyStringSliceHack
5153
fs.StringSlice("skip-dirs", nil, color.GreenString("Regexps of directories to skip")) // Hack see Loader.applyStringSliceHack
5254
internal.AddFlagAndBind(v, fs, fs.Bool, "skip-dirs-use-default", "run.skip-dirs-use-default", true, getDefaultDirectoryExcludeHelp())
53-
fs.StringSlice("skip-files", nil, color.GreenString("Regexps of files to skip")) // Hack see Loader.applyStringSliceHack
5455

5556
const allowParallelDesc = "Allow multiple parallel golangci-lint instances running. " +
5657
"If false (default) - golangci-lint acquires file lock on start."
@@ -92,6 +93,11 @@ func setupIssuesFlagSet(v *viper.Viper, fs *pflag.FlagSet) {
9293
internal.AddFlagAndBind(v, fs, fs.Int, "max-same-issues", "issues.max-same-issues", 3,
9394
color.GreenString("Maximum count of issues with the same text. Set to 0 to disable"))
9495

96+
fs.StringSlice("exclude-files", nil, color.GreenString("Regexps of files to exclude")) // Hack see Loader.applyStringSliceHack
97+
fs.StringSlice("exclude-dirs", nil, color.GreenString("Regexps of directories to exclude")) // Hack see Loader.applyStringSliceHack
98+
internal.AddFlagAndBind(v, fs, fs.Bool, "exclude-dirs-use-default", "issues.exclude-dirs-use-default", true,
99+
getDefaultDirectoryExcludeHelp())
100+
95101
const newDesc = "Show only new issues: if there are unstaged changes or untracked files, only those changes " +
96102
"are analyzed, else only changes in HEAD~ are analyzed.\nIt's a super-useful option for integration " +
97103
"of golangci-lint into existing large codebase.\nIt's not practical to fix all existing issues at " +

pkg/config/loader.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,12 @@ func (l *Loader) applyStringSliceHack() {
278278
l.appendStringSlice("disable", &l.cfg.Linters.Disable)
279279
l.appendStringSlice("presets", &l.cfg.Linters.Presets)
280280
l.appendStringSlice("build-tags", &l.cfg.Run.BuildTags)
281+
l.appendStringSlice("exclude", &l.cfg.Issues.ExcludePatterns)
282+
281283
l.appendStringSlice("skip-dirs", &l.cfg.Run.SkipDirs)
282284
l.appendStringSlice("skip-files", &l.cfg.Run.SkipFiles)
283-
l.appendStringSlice("exclude", &l.cfg.Issues.ExcludePatterns)
285+
l.appendStringSlice("skip-dirs", &l.cfg.Issues.ExcludeDirs)
286+
l.appendStringSlice("skip-files", &l.cfg.Issues.ExcludeFiles)
284287
}
285288

286289
func (l *Loader) appendStringSlice(name string, current *[]string) {

0 commit comments

Comments
 (0)