diff --git a/zsh_completions.go b/zsh_completions.go index b58a5d68..e2476b62 100644 --- a/zsh_completions.go +++ b/zsh_completions.go @@ -25,6 +25,7 @@ var ( "extractFlags": zshCompExtractFlag, "genFlagEntryForZshArguments": zshCompGenFlagEntryForArguments, "extractArgsCompletions": zshCompExtractArgumentCompletionHintsForRendering, + "escapeText": zshCompQuoteFlagDescription, } zshCompletionText = ` {{/* should accept Command (that contains subcommands) as parameter */}} @@ -41,7 +42,7 @@ function {{$cmdPath}} { case $state in cmnds) commands=({{range .Commands}}{{if not .Hidden}} - "{{.Name}}:{{.Short}}"{{end}}{{end}} + "{{.Name}}:{{.Short | escapeText}}"{{end}}{{end}} ) _describe "command" commands ;; @@ -334,5 +335,7 @@ func zshCompFlagCouldBeSpecifiedMoreThenOnce(f *pflag.Flag) bool { func zshCompQuoteFlagDescription(s string) string { return strings.NewReplacer("'", `'\''`, "[", `\[`, - "]", `\]`).Replace(s) + "]", `\]`, + "$(", `\$(`, + ).Replace(s) } diff --git a/zsh_completions_test.go b/zsh_completions_test.go index 8079f6cf..a9405fe1 100644 --- a/zsh_completions_test.go +++ b/zsh_completions_test.go @@ -240,6 +240,25 @@ func TestGenZshCompletion(t *testing.T) { `--ptest\[ptest]:filename:_files -g "-\(/\)"`, }, }, + { + name: "escape text in subcommand description", + root: func() *Command { + r := &Command{ + Use: "rootcmd", + Long: "Long rootcmd description", + } + d := &Command{ + Use: "subcmd1", + Short: "$(echo foo)", + Run: emptyRun, + } + r.AddCommand(d) + return r + }(), + expectedExpressions: []string{ + `\$\(echo foo\)`, + }, + }, } for _, tc := range tcs {