Allow shell-completing multiple --json fields separated by commas

mislav · mislav · commit 4d7625c8a051 · 2021-07-21T16:12:38.000+02:00
diff --git a/pkg/cmdutil/json_flags.go b/pkg/cmdutil/json_flags.go
@@ -29,13 +29,15 @@ func AddJSONFlags(cmd *cobra.Command, exportTarget *Exporter, fields []string) {
 
 	_ = cmd.RegisterFlagCompletionFunc("json", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		var results []string
-		if idx := strings.IndexRune(toComplete, ','); idx >= 0 {
+		var prefix string
+		if idx := strings.LastIndexByte(toComplete, ','); idx >= 0 {
+			prefix = toComplete[:idx+1]
 			toComplete = toComplete[idx+1:]
 		}
 		toComplete = strings.ToLower(toComplete)
 		for _, f := range fields {
 			if strings.HasPrefix(strings.ToLower(f), toComplete) {
-				results = append(results, f)
+				results = append(results, prefix+f)
 			}
 		}
 		sort.Strings(results)

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,15 @@ func AddJSONFlags(cmd cobra.Command, exportTarget Exporter, fields []string) {`
`29`	`29`
`30`	`30`	`_ = cmd.RegisterFlagCompletionFunc("json", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`31`	`31`	`var results []string`
`32`		`- if idx := strings.IndexRune(toComplete, ','); idx >= 0 {`
	`32`	`+ var prefix string`
	`33`	`+ if idx := strings.LastIndexByte(toComplete, ','); idx >= 0 {`
	`34`	`+ prefix = toComplete[:idx+1]`
`33`	`35`	`toComplete = toComplete[idx+1:]`
`34`	`36`	`}`
`35`	`37`	`toComplete = strings.ToLower(toComplete)`
`36`	`38`	`for _, f := range fields {`
`37`	`39`	`if strings.HasPrefix(strings.ToLower(f), toComplete) {`
`38`		`- results = append(results, f)`
	`40`	`+ results = append(results, prefix+f)`
`39`	`41`	`}`
`40`	`42`	`}`
`41`	`43`	`sort.Strings(results)`