Merge pull request #1034 from rsteube/go-fix-delimiter

go: test - fix delimiter
carapace-sh · Apr 11, 2022 · fee8191 · fee8191
2 parents 6d1d9e9 + 85766cb
commit fee8191
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/completers/go_completer/cmd/action/test.go b/completers/go_completer/cmd/action/test.go
@@ -4,6 +4,7 @@ import (
 	"strings"
 
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace/pkg/style"
 )
 
 type TestOpts struct {
@@ -17,12 +18,14 @@ func ActionTests(packages []string, opts TestOpts) carapace.Action {
 		lines := strings.Split(string(output), "\n")
 		vals := make([]string, 0)
 		for _, line := range lines {
-			if (opts.Benchmark && strings.HasPrefix(line, "Benchmark")) ||
-				(opts.Example && strings.HasPrefix(line, "Example")) ||
-				(opts.Test && strings.HasPrefix(line, "Test")) {
-				vals = append(vals, line)
+			if opts.Benchmark && strings.HasPrefix(line, "Benchmark") {
+				vals = append(vals, line, style.Blue)
+			} else if opts.Example && strings.HasPrefix(line, "Example") {
+				vals = append(vals, line, style.Green)
+			} else if opts.Test && strings.HasPrefix(line, "Test") {
+				vals = append(vals, line, style.Default)
 			}
 		}
-		return carapace.ActionValues(vals...)
+		return carapace.ActionStyledValues(vals...)
 	})
 }
diff --git a/completers/go_completer/cmd/test.go b/completers/go_completer/cmd/test.go
@@ -38,15 +38,12 @@ func init() {
 	testCmd.Flags().String("vet", "", "configure the invocation of \"go vet\" during \"go test\" to use the comma-separated list of vet check")
 	rootCmd.AddCommand(testCmd)
 
-	testCmd.Flag("bench").NoOptDefVal = " "
-	testCmd.Flag("run").NoOptDefVal = " "
-
 	carapace.Gen(testCmd).FlagCompletion(carapace.ActionMap{
-		"bench": carapace.ActionMultiParts("/", func(c carapace.Context) carapace.Action {
+		"bench": carapace.ActionMultiParts("|", func(c carapace.Context) carapace.Action {
 			return action.ActionTests(c.Args, action.TestOpts{Benchmark: true}).Invoke(c).Filter(c.Parts).ToA()
 		}),
 		"covermode": carapace.ActionValues("set", "count,atomic"),
-		"run": carapace.ActionMultiParts("/", func(c carapace.Context) carapace.Action {
+		"run": carapace.ActionMultiParts("|", func(c carapace.Context) carapace.Action {
 			return action.ActionTests(c.Args, action.TestOpts{Example: true, Test: true}).Invoke(c).Filter(c.Parts).ToA()
 		}),
 	})