Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-13 14:22:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(complete): Fix unescaped single quotes in zsh

Browse source 
help strings for subcomand args did not escape single quotes
This commit is contained in:
Clifton King 2022-01-15 13:24:35 -06:00
parent d178de7cf8
commit 658b7a0841
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clap_complete/src/shells/zsh.rs
View file

@ -634,6 +634,7 @@ fn write_positionals_of(p: &App) -> String {
.map_or("".to_owned(), |v| " -- ".to_owned() + v) .map_or("".to_owned(), |v| " -- ".to_owned() + v)
.replace('[', "\\[") .replace('[', "\\[")
.replace(']', "\\]") .replace(']', "\\]")
.replace('\'', "'\\''")
.replace(':', "\\:"), .replace(':', "\\:"),
value_completion = value_completion(arg).unwrap_or_else(|| "".to_string()) value_completion = value_completion(arg).unwrap_or_else(|| "".to_string())
); );

20
clap_complete/tests/completions/zsh.rs
View file

@ -8,18 +8,18 @@ fn build_app_with_name(s: &'static str) -> App<'static> {
App::new(s) App::new(s)
.version("3.0") .version("3.0")
.setting(AppSettings::PropagateVersion) .setting(AppSettings::PropagateVersion)
.about("Tests completions") .about("Test test's completions")
.arg( .arg(
Arg::new("file") Arg::new("file")
.value_hint(ValueHint::FilePath) .value_hint(ValueHint::FilePath)
.help("some input file"), .help("some input's file"),
) )
.subcommand( .subcommand(
App::new("test").about("tests things").arg( App::new("test").about("test test's things").arg(
Arg::new("case") Arg::new("case")
.long("case") .long("case")
.takes_value(true) .takes_value(true)
.help("the case to test"), .help("test's cases to test"),
), ),
) )
} }
@ -51,7 +51,7 @@ _myapp() {
'--help[Print help information]' \ '--help[Print help information]' \
'-V[Print version information]' \ '-V[Print version information]' \
'--version[Print version information]' \ '--version[Print version information]' \
'::file -- some input file:_files' \ '::file -- some input'\''s file:_files' \
":: :_myapp_commands" \ ":: :_myapp_commands" \
"*::: :->myapp" \ "*::: :->myapp" \
&& ret=0 && ret=0
@ -63,7 +63,7 @@ _myapp() {
case $line[2] in case $line[2] in
(test) (test)
_arguments "${_arguments_options[@]}" \ _arguments "${_arguments_options[@]}" \
'--case=[the case to test]: : ' \ '--case=[test'\''s cases to test]: : ' \
'-h[Print help information]' \ '-h[Print help information]' \
'--help[Print help information]' \ '--help[Print help information]' \
'-V[Print version information]' \ '-V[Print version information]' \
@ -82,7 +82,7 @@ esac
(( $+functions[_myapp_commands] )) || (( $+functions[_myapp_commands] )) ||
_myapp_commands() { _myapp_commands() {
local commands; commands=( local commands; commands=(
'test:tests things' \ 'test:test test'\''s things' \
'help:Print this message or the help of the given subcommand(s)' \ 'help:Print this message or the help of the given subcommand(s)' \
) )
_describe -t commands 'myapp commands' commands "$@" _describe -t commands 'myapp commands' commands "$@"
@ -145,7 +145,7 @@ _my_app() {
'--help[Print help information]' \ '--help[Print help information]' \
'-V[Print version information]' \ '-V[Print version information]' \
'--version[Print version information]' \ '--version[Print version information]' \
'::file -- some input file:_files' \ '::file -- some input'\''s file:_files' \
":: :_my_app_commands" \ ":: :_my_app_commands" \
"*::: :->my_app" \ "*::: :->my_app" \
&& ret=0 && ret=0
@ -157,7 +157,7 @@ _my_app() {
case $line[2] in case $line[2] in
(test) (test)
_arguments "${_arguments_options[@]}" \ _arguments "${_arguments_options[@]}" \
'--case=[the case to test]: : ' \ '--case=[test'\''s cases to test]: : ' \
'-h[Print help information]' \ '-h[Print help information]' \
'--help[Print help information]' \ '--help[Print help information]' \
'-V[Print version information]' \ '-V[Print version information]' \
@ -201,7 +201,7 @@ esac
(( $+functions[_my_app_commands] )) || (( $+functions[_my_app_commands] )) ||
_my_app_commands() { _my_app_commands() {
local commands; commands=( local commands; commands=(
'test:tests things' \ 'test:test test'\''s things' \
'some_cmd:tests other things' \ 'some_cmd:tests other things' \
'some-cmd-with-hypens:' \ 'some-cmd-with-hypens:' \
'some_cmd_with_special_characters:This '\''is'\'' a "special" \[character\] string \\' \ 'some_cmd_with_special_characters:This '\''is'\'' a "special" \[character\] string \\' \