Merge pull request #187 from kisielk/build-tags

Support comma-separated build tags

internal/errcheck/errcheck.go

@@ -177,7 +177,7 @@ func (c *Checker) load(paths ...string) ([]*packages.Package, error) {
 	cfg := &packages.Config{
 		Mode:       packages.LoadAllSyntax,
 		Tests:      !c.WithoutTests,
-		BuildFlags: []string{fmt.Sprintf("-tags=%s", strings.Join(c.Tags, " "))},
+		BuildFlags: []string{fmtTags(c.Tags)},
 	}
 	return loadPackages(cfg, paths...)
 }

internal/errcheck/tags.go

@@ -0,0 +1,12 @@
+// +build go1.13
+
+package errcheck
+
+import (
+	"fmt"
+	"strings"
+)
+
+func fmtTags(tags []string) string {
+	return fmt.Sprintf("-tags=%s", strings.Join(tags, ","))
+}

internal/errcheck/tags_compat.go

@@ -0,0 +1,13 @@
+// +build go1.11
+// +build !go1.13
+
+package errcheck
+
+import (
+	"fmt"
+	"strings"
+)
+
+func fmtTags(tags []string) string {
+	return fmt.Sprintf("-tags=%s", strings.Join(tags, " "))
+}

main.go

@@ -62,17 +62,16 @@ func (f ignoreFlag) Set(s string) error {
 type tagsFlag []string
 
 func (f *tagsFlag) String() string {
-	return fmt.Sprintf("%q", strings.Join(*f, " "))
+	return fmt.Sprintf("%q", strings.Join(*f, ","))
 }
 
 func (f *tagsFlag) Set(s string) error {
 	if s == "" {
 		return nil
 	}
-	tags := strings.Split(s, " ")
-	if tags == nil {
-		return nil
-	}
+	tags := strings.FieldsFunc(s, func(c rune) bool {
+		return c == ' ' || c == ','
+	})
 	for _, tag := range tags {
 		if tag != "" {
 			*f = append(*f, tag)
@@ -137,7 +136,7 @@ func parseFlags(checker *errcheck.Checker, args []string) ([]string, int) {
 	flags.BoolVar(&abspath, "abspath", false, "print absolute paths to files")
 
 	tags := tagsFlag{}
-	flags.Var(&tags, "tags", "space-separated list of build tags to include")
+	flags.Var(&tags, "tags", "comma or space-separated list of build tags to include")
 	ignorePkg := flags.String("ignorepkg", "", "comma-separated list of package paths to ignore")
 	ignore := ignoreFlag(map[string]*regexp.Regexp{})
 	flags.Var(ignore, "ignore", "[deprecated] comma-separated list of pairs of the form pkg:regex\n"+

main_test.go

@@ -163,6 +163,15 @@ func TestParseFlags(t *testing.T) {
 			asserts: false,
 			error:   exitCodeOk,
 		},
+		parseTestCase{
+			args:    []string{"errcheck", "-tags", "foo,bar,!baz"},
+			paths:   []string{"."},
+			ignore:  map[string]string{},
+			tags:    []string{"foo", "bar", "!baz"},
+			blank:   false,
+			asserts: false,
+			error:   exitCodeOk,
+		},
 		parseTestCase{
 			args:    []string{"errcheck", "-tags", "foo   bar   !baz"},
 			paths:   []string{"."},