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(Fish Completions): fixes a bug where single quotes are not escaped

Browse source 
Closes #704
This commit is contained in:
Kevin K 2016-10-25 10:34:46 -04:00
parent 9b32a5aa26
commit 780b4a1828
No known key found for this signature in database
GPG key ID: 17218E4B3692F01A
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/completions/fish.rs
View file

@ -58,7 +58,7 @@ fn gen_fish_inner(root_command: &str,
// -f # don't use file completion
// -n "__fish_using_command myprog subcmd1" # complete for command "myprog subcmd1"
let basic_template = format!("complete -c {} -n '__fish_using_command {}'",
let basic_template = format!("complete -c {} -n \"__fish_using_command {}\"",
root_command,
parent_cmds);
@ -71,10 +71,10 @@ fn gen_fish_inner(root_command: &str,
template.push_str(format!(" -l {}", data).as_str());
}
if let Some(data) = option.help {
template.push_str(format!(" -d '{}'", data).as_str());
template.push_str(format!(" -d \"{}\"", data).as_str());
}
if let Some(ref data) = option.possible_vals {
template.push_str(format!(" -r -f -a '{}'", data.join(" ")).as_str());
template.push_str(format!(" -r -f -a \"{}\"", data.join(" ")).as_str());
}
buffer.push_str(template.as_str());
buffer.push_str("\n");
@ -89,7 +89,7 @@ fn gen_fish_inner(root_command: &str,
template.push_str(format!(" -l {}", data).as_str());
}
if let Some(data) = flag.help {
template.push_str(format!(" -d '{}'", data).as_str());
template.push_str(format!(" -d \"{}\"", data).as_str());
}
buffer.push_str(template.as_str());
buffer.push_str("\n");
@ -98,7 +98,7 @@ fn gen_fish_inner(root_command: &str,
for subcommand in &comp_gen.p.subcommands {
let mut template = basic_template.clone();
template.push_str(" -f");
template.push_str(format!(" -a '{}'", &subcommand.p.meta.name).as_str());
template.push_str(format!(" -a \"{}\"", &subcommand.p.meta.name).as_str());
buffer.push_str(template.as_str());
buffer.push_str("\n");
}