review

Author: ldez

pkg/commands/flagsets.go

@@ -27,7 +27,12 @@ func setupLintersFlagSet(v *viper.Viper, fs *pflag.FlagSet) {
 	internal.AddFlagAndBind(v, fs, fs.Bool, "fast", "linters.fast", false,
 		color.GreenString("Enable only fast linters from enabled linters set (first run won't be fast)"))
 
-	internal.AddHackedStringSliceP(fs, "presets", "p", getPresetsHelp())
+	internal.AddHackedStringSliceP(fs, "presets", "p",
+		formatList("Enable presets of linters:", lintersdb.AllPresets(),
+			"Run 'golangci-lint help linters' to see them.",
+			"This option implies option --disable-all",
+		),
+	)
 
 	fs.StringSlice("enable-only", nil,
 		color.GreenString("Override linters configuration section to only run the specific linter(s)")) // Flags only.
@@ -51,7 +56,7 @@ func setupRunFlagSet(v *viper.Viper, fs *pflag.FlagSet) {
 	internal.AddDeprecatedHackedStringSlice(fs, "skip-files", color.GreenString("Regexps of files to skip"))
 	internal.AddDeprecatedHackedStringSlice(fs, "skip-dirs", color.GreenString("Regexps of directories to skip"))
 	internal.AddDeprecatedFlagAndBind(v, fs, fs.Bool, "skip-dirs-use-default", "run.skip-dirs-use-default", true,
-		getDefaultDirectoryExcludeHelp())
+		formatList("Use or not use default excluded directories:", processors.StdExcludeDirRegexps))
 
 	const allowParallelDesc = "Allow multiple parallel golangci-lint instances running.\n" +
 		"If false (default) - golangci-lint acquires file lock on start."
@@ -63,7 +68,8 @@ func setupRunFlagSet(v *viper.Viper, fs *pflag.FlagSet) {
 }
 
 func setupOutputFlagSet(v *viper.Viper, fs *pflag.FlagSet) {
-	internal.AddFlagAndBind(v, fs, fs.String, "out-format", "output.formats", config.OutFormatColoredLineNumber, getOutFormatHelp())
+	internal.AddFlagAndBind(v, fs, fs.String, "out-format", "output.formats", config.OutFormatColoredLineNumber,
+		formatList("Formats of output:", config.AllOutputFormats))
 	internal.AddFlagAndBind(v, fs, fs.Bool, "print-issued-lines", "output.print-issued-lines", true,
 		color.GreenString("Print lines of code with issue"))
 	internal.AddFlagAndBind(v, fs, fs.Bool, "print-linter-name", "output.print-linter-name", true,
@@ -95,7 +101,7 @@ func setupIssuesFlagSet(v *viper.Viper, fs *pflag.FlagSet) {
 	internal.AddHackedStringSlice(fs, "exclude-files", color.GreenString("Regexps of files to exclude"))
 	internal.AddHackedStringSlice(fs, "exclude-dirs", color.GreenString("Regexps of directories to exclude"))
 	internal.AddFlagAndBind(v, fs, fs.Bool, "exclude-dirs-use-default", "issues.exclude-dirs-use-default", true,
-		getDefaultDirectoryExcludeHelp())
+		formatList("Use or not use default excluded directories:", processors.StdExcludeDirRegexps))
 
 	internal.AddFlagAndBind(v, fs, fs.String, "exclude-generated", "issues.exclude-generated", processors.AutogeneratedModeLax,
 		color.GreenString("Mode of the generated files analysis"))
@@ -117,22 +123,20 @@ func setupIssuesFlagSet(v *viper.Viper, fs *pflag.FlagSet) {
 		color.GreenString("Fix found issues (if it's supported by the linter)"))
 }
 
-func getPresetsHelp() string {
-	parts := []string{color.GreenString("Enable presets of linters:")}
-	for _, p := range lintersdb.AllPresets() {
+func formatList(head string, items []string, foot ...string) string {
+	parts := []string{color.GreenString(head)}
+	for _, p := range items {
 		parts = append(parts, fmt.Sprintf("  - %s", color.YellowString(p)))
 	}
-	parts = append(parts, color.GreenString("Run 'golangci-lint help linters' to see them."),
-		color.GreenString("This option implies option --disable-all"))
-	return strings.Join(parts, "\n")
-}
 
-func getOutFormatHelp() string {
-	parts := []string{color.GreenString("Formats of output:")}
-	for _, f := range config.AllOutputFormats {
-		parts = append(parts, fmt.Sprintf("  - %s", color.YellowString(f)))
+	for _, s := range foot {
+		parts = append(parts, color.GreenString(s))
 	}
-	parts = append(parts, "")
+
+	if len(foot) == 0 {
+		parts = append(parts, "")
+	}
+
 	return strings.Join(parts, "\n")
 }
 
@@ -148,12 +152,3 @@ func getDefaultIssueExcludeHelp() string {
 
 	return strings.Join(parts, "\n")
 }
-
-func getDefaultDirectoryExcludeHelp() string {
-	parts := []string{color.GreenString("Use or not use default excluded directories:")}
-	for _, dir := range processors.StdExcludeDirRegexps {
-		parts = append(parts, fmt.Sprintf("  - %s", color.YellowString(dir)))
-	}
-	parts = append(parts, "")
-	return strings.Join(parts, "\n")
-}