mirror
/
cobra
mirror of https://github.com/spf13/cobra.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Bash completion for names with ':' character.

This commit is contained in:
Adam Bozanich 2015-12-09 20:57:45 -08:00
parent 29cddf65b2
commit fe79245d1a
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bash_completions.go
View File

@ -103,6 +103,8 @@ __handle_reply()
if [[ ${#COMPREPLY[@]} -eq 0 ]]; then if [[ ${#COMPREPLY[@]} -eq 0 ]]; then
declare -F __custom_func >/dev/null && __custom_func declare -F __custom_func >/dev/null && __custom_func
fi fi
__ltrim_colon_completions "$cur"
} }
# The arguments should be in the form "ext1|ext2|extn" # The arguments should be in the form "ext1|ext2|extn"
@ -166,9 +168,9 @@ __handle_command()
local next_command local next_command
if [[ -n ${last_command} ]]; then if [[ -n ${last_command} ]]; then
next_command="_${last_command}_${words[c]}" next_command="_${last_command}_${words[c]//:/__}"
else else
next_command="_${words[c]}" next_command="_${words[c]//:/__}"
fi fi
c=$((c+1)) c=$((c+1))
__debug "${FUNCNAME}: looking for ${next_command}" __debug "${FUNCNAME}: looking for ${next_command}"
@ -196,6 +198,7 @@ __handle_word()
} }
func postscript(out *bytes.Buffer, name string) { func postscript(out *bytes.Buffer, name string) {
name = strings.Replace(name, ":", "__", -1)
fmt.Fprintf(out, "__start_%s()\n", name) fmt.Fprintf(out, "__start_%s()\n", name)
fmt.Fprintf(out, `{ fmt.Fprintf(out, `{
local cur prev words cword local cur prev words cword
@ -355,6 +358,7 @@ func gen(cmd *Command, out *bytes.Buffer) {
} }
commandName := cmd.CommandPath() commandName := cmd.CommandPath()
commandName = strings.Replace(commandName, " ", "_", -1) commandName = strings.Replace(commandName, " ", "_", -1)
commandName = strings.Replace(commandName, ":", "__", -1)
fmt.Fprintf(out, "_%s()\n{\n", commandName) fmt.Fprintf(out, "_%s()\n{\n", commandName)
fmt.Fprintf(out, " last_command=%q\n", commandName) fmt.Fprintf(out, " last_command=%q\n", commandName)
writeCommands(cmd, out) writeCommands(cmd, out)

3
bash_completions_test.go
View File

@ -34,7 +34,7 @@ COMPREPLY=( "hello" )
func TestBashCompletions(t *testing.T) { func TestBashCompletions(t *testing.T) {
c := initializeWithRootCmd() c := initializeWithRootCmd()
cmdEcho.AddCommand(cmdTimes) cmdEcho.AddCommand(cmdTimes)
c.AddCommand(cmdEcho, cmdPrint, cmdDeprecated) c.AddCommand(cmdEcho, cmdPrint, cmdDeprecated, cmdColon)
// custom completion function // custom completion function
c.BashCompletionFunction = bash_completion_func c.BashCompletionFunction = bash_completion_func
@ -75,6 +75,7 @@ func TestBashCompletions(t *testing.T) {
check(t, str, "_cobra-test_echo") check(t, str, "_cobra-test_echo")
check(t, str, "_cobra-test_echo_times") check(t, str, "_cobra-test_echo_times")
check(t, str, "_cobra-test_print") check(t, str, "_cobra-test_print")
check(t, str, "_cobra-test_cmd__colon")
// check for required flags // check for required flags
check(t, str, `must_have_one_flag+=("--introot=")`) check(t, str, `must_have_one_flag+=("--introot=")`)

6
cobra_test.go
View File

@ -143,6 +143,12 @@ var cmdVersion2 = &Command{
}, },
} }
var cmdColon = &Command{
Use: "cmd:colon",
Run: func(cmd *Command, args []string) {
},
}
func flagInit() { func flagInit() {
cmdEcho.ResetFlags() cmdEcho.ResetFlags()
cmdPrint.ResetFlags() cmdPrint.ResetFlags()