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

Auto merge of #687 - wdv4758h:issue_685, r=kbknapp

Browse source 
fix(Completions): fish completions for nested subcommands

Fix #685
This commit is contained in:
Homu 2016-10-16 12:02:53 +09:00
commit e151bfc2e8
1 changed files with 35 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
src/completions.rs
View file

@ -231,27 +231,26 @@ complete -F _{name} {name}
fn gen_fish<W: Write>(&self, buf: &mut W) { fn gen_fish<W: Write>(&self, buf: &mut W) {
let command = self.p.meta.bin_name.as_ref().unwrap(); let command = self.p.meta.bin_name.as_ref().unwrap();
let subcommands: Vec<_> = get_all_subcommands(self.p);
let has_subcommands = subcommands.len() > 1;
// function to detect subcommand // function to detect subcommand
let detect_subcommand_function = if has_subcommands { let detect_subcommand_function =
format!( r#"function __fish_using_command
r#"function __fish_{}_no_subcommand --description "Test if there isn't given a subcommand" set cmd (commandline -opc)
for i in (commandline -opc) if [ (count $cmd) -eq (count $argv) ]
if contains -- $i {} for i in (seq (count $argv))
return 1 if [ $cmd[$i] != $argv[$i] ]
return 1
end
end end
return 0
end end
return 0 return 1
end end
"#, command, subcommands.join(" "))
} else { "#.to_string();
"".to_string()
};
let mut buffer = detect_subcommand_function; let mut buffer = detect_subcommand_function;
gen_fish_inner(command, self, vec![], &mut buffer, has_subcommands); gen_fish_inner(command, self, &command.to_string(), &mut buffer);
w!(buf, buffer.as_bytes()); w!(buf, buffer.as_bytes());
} }
} }
@ -359,9 +358,9 @@ fn vals_for(o: &OptBuilder) -> String {
fn gen_fish_inner(root_command: &str, fn gen_fish_inner(root_command: &str,
comp_gen: &ComplGen, comp_gen: &ComplGen,
parent_cmds: Vec<&String>, parent_cmds: &String,
buffer: &mut String, buffer: &mut String) {
has_no_subcommand_fn: bool) {
// example : // example :
// //
// complete // complete
@ -372,20 +371,14 @@ fn gen_fish_inner(root_command: &str,
// -a "{possible_arguments}" // -a "{possible_arguments}"
// -r # if require parameter // -r # if require parameter
// -f # don't use file completion // -f # don't use file completion
// -n "__fish_seen_subcommand_from install" # complete for subcommand "install" // -n "__fish_using_command myprog subcmd1" # complete for command "myprog subcmd1"
let command = &comp_gen.p.meta.name; let basic_template = format!("complete -c {} -n '__fish_using_command {}'",
let subcommands: Vec<_> = get_all_subcommands(comp_gen.p); root_command,
parent_cmds);
for option in &comp_gen.p.opts { for option in &comp_gen.p.opts {
let mut template = format!("complete -c {}", root_command); let mut template = basic_template.clone();
if !parent_cmds.is_empty() {
template.push_str(format!(" -n '__fish_seen_subcommand_from {}'", command).as_str());
} else if has_no_subcommand_fn {
template.push_str(format!(" -n '__fish_{}_no_subcommand'",
comp_gen.p.meta.bin_name.as_ref().unwrap())
.as_str());
}
if let Some(data) = option.short { if let Some(data) = option.short {
template.push_str(format!(" -s {}", data).as_str()); template.push_str(format!(" -s {}", data).as_str());
} }
@ -403,14 +396,7 @@ fn gen_fish_inner(root_command: &str,
} }
for flag in &comp_gen.p.flags { for flag in &comp_gen.p.flags {
let mut template = format!("complete -c {}", root_command); let mut template = basic_template.clone();
if !parent_cmds.is_empty() {
template.push_str(format!(" -n '__fish_seen_subcommand_from {}'", command).as_str());
} else if has_no_subcommand_fn {
template.push_str(format!(" -n '__fish_{}_no_subcommand'",
comp_gen.p.meta.bin_name.as_ref().unwrap())
.as_str());
}
if let Some(data) = flag.short { if let Some(data) = flag.short {
template.push_str(format!(" -s {}", data).as_str()); template.push_str(format!(" -s {}", data).as_str());
} }
@ -424,34 +410,26 @@ fn gen_fish_inner(root_command: &str,
buffer.push_str("\n"); buffer.push_str("\n");
} }
if subcommands.len() > 1 { for subcommand in &comp_gen.p.subcommands {
for subcommand in subcommands { let mut template = basic_template.clone();
let mut template = format!("complete -c {}", root_command); template.push_str(" -f");
if !parent_cmds.is_empty() { template.push_str(format!(" -a '{}'", &subcommand.p.meta.name).as_str());
template.push_str(format!(" -n '__fish_seen_subcommand_from {}'", buffer.push_str(template.as_str());
subcommand) buffer.push_str("\n");
.as_str());
} else if has_no_subcommand_fn {
template.push_str(format!(" -n '__fish_{}_no_subcommand'",
comp_gen.p.meta.bin_name.as_ref().unwrap())
.as_str());
}
template.push_str(" -f");
template.push_str(format!(" -a '{}'", subcommand).as_str());
buffer.push_str(template.as_str());
buffer.push_str("\n");
}
} }
// generate options of subcommands // generate options of subcommands
for subcommand in &comp_gen.p.subcommands { for subcommand in &comp_gen.p.subcommands {
let sub_comp_gen = ComplGen::new(&subcommand.p); let sub_comp_gen = ComplGen::new(&subcommand.p);
// make new "parent_cmds" for different subcommands
let mut sub_parent_cmds = parent_cmds.clone(); let mut sub_parent_cmds = parent_cmds.clone();
sub_parent_cmds.push(command); if !sub_parent_cmds.is_empty() {
sub_parent_cmds.push_str(" ");
}
sub_parent_cmds.push_str(&subcommand.p.meta.name);
gen_fish_inner(root_command, gen_fish_inner(root_command,
&sub_comp_gen, &sub_comp_gen,
sub_parent_cmds, &mut sub_parent_cmds,
buffer, buffer);
has_no_subcommand_fn);
} }
} }