glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2024-11-25 07:07:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

All test passing

Browse source
This commit is contained in:
Brandon Roehl 2018-06-27 11:10:57 -05:00
parent f76be5b1f0
commit 009ebb14c9
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
zsh_completions.go
View file

@ -1,4 +1,4 @@
package main package cobra
import ( import (
"bytes" "bytes"
@ -6,6 +6,8 @@ import (
"io" "io"
"os" "os"
"strings" "strings"
flag "github.com/spf13/pflag"
) )
// GenZshCompletionFile generates zsh completion file. // GenZshCompletionFile generates zsh completion file.
@ -124,7 +126,11 @@ func commandNames(command *Command) []string {
commands := command.Commands() commands := command.Commands()
ns := make([]string, len(commands)) ns := make([]string, len(commands))
for i, c := range commands { for i, c := range commands {
ns[i] = fmt.Sprintf("%s[%s]", c.Name(), c.Short) commandMsg := c.Name()
if len(c.Short) > 0 {
commandMsg += fmt.Sprintf("[%s]", c.Short)
}
ns[i] = commandMsg
} }
return ns return ns
} }
@ -132,12 +138,17 @@ func commandNames(command *Command) []string {
func commandFlags(command *Command) []string { func commandFlags(command *Command) []string {
flags := command.Flags() flags := command.Flags()
ns := make([]string, 0) ns := make([]string, 0)
flags.VisitAll(func(flag *pflag.Flag) { flags.VisitAll(func(flag *flag.Flag) {
var flagMsg string
if len(flag.Shorthand) > 0 { if len(flag.Shorthand) > 0 {
ns = append(ns, fmt.Sprintf("{-%s,--%s}'[%s]'", flag.Shorthand, flag.Name, flag.Usage)) flagMsg = fmt.Sprintf("{-%s,--%s}", flag.Shorthand, flag.Name)
} else { } else {
ns = append(ns, fmt.Sprintf("--%s'[%s]'", flag.Name, flag.Usage)) flagMsg = fmt.Sprintf("--%s", flag.Name)
} }
if len(flag.Usage) > 0 {
flagMsg += fmt.Sprintf("'[%s]'", flag.Usage)
}
ns = append(ns, flagMsg)
}) })
return ns return ns
} }

4
zsh_completions_test.go
View file

@ -42,7 +42,7 @@ func TestZshCompletion(t *testing.T) {
r.AddCommand(&Command{Use: "c2"}) r.AddCommand(&Command{Use: "c2"})
return r return r
}(), }(),
expectedExpressions: []string{"(c1 c2)"}, expectedExpressions: []string{"'c1' 'c2'"},
}, },
{ {
name: "tree", name: "tree",
@ -69,7 +69,7 @@ func TestZshCompletion(t *testing.T) {
return r return r
}(), }(),
expectedExpressions: []string{"(sub11 sub12)", "(sub21 sub22)"}, expectedExpressions: []string{"'sub11' 'sub12'", "'sub21' 'sub22'"},
}, },
} }