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

imp(PowerShell Completions): massively dedups subcommand names in the generate script to make smaller scripts that are still functionally equiv

Browse source
This commit is contained in:
Kevin K 2017-04-18 23:17:05 -04:00
parent a8bce55837
commit 85b0e1cc4b
No known key found for this signature in database
GPG key ID: 17218E4B3692F01A
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/completions/powershell.rs
View file

@ -18,7 +18,8 @@ impl<'a, 'b> PowerShellGen<'a, 'b> {
pub fn generate_to<W: Write>(&self, buf: &mut W) { pub fn generate_to<W: Write>(&self, buf: &mut W) {
let bin_name = self.p.meta.bin_name.as_ref().unwrap(); let bin_name = self.p.meta.bin_name.as_ref().unwrap();
let (subcommands_detection_cases, subcommands_cases) = generate_inner(self.p, ""); let mut names = vec![];
let (subcommands_detection_cases, subcommands_cases) = generate_inner(self.p, "", &mut names);
let mut bin_names = vec![bin_name.to_string(), format!("./{0}", bin_name)]; let mut bin_names = vec![bin_name.to_string(), format!("./{0}", bin_name)];
if cfg!(windows) { if cfg!(windows) {
@ -73,7 +74,7 @@ impl<'a, 'b> PowerShellGen<'a, 'b> {
} }
} }
fn generate_inner<'a, 'b>(p: &Parser<'a, 'b>, previous_command_name: &str) -> (String, String) { fn generate_inner<'a, 'b, 'p>(p: &'p Parser<'a, 'b>, previous_command_name: &str, names: &mut Vec<&'p str>) -> (String, String) {
debugln!("PowerShellGen::generate_inner;"); debugln!("PowerShellGen::generate_inner;");
let command_name = if previous_command_name.is_empty() { let command_name = if previous_command_name.is_empty() {
format!("{}_{}", previous_command_name, &p.meta.bin_name.as_ref().expect(INTERNAL_ERROR_MSG)) format!("{}_{}", previous_command_name, &p.meta.bin_name.as_ref().expect(INTERNAL_ERROR_MSG))
@ -81,9 +82,10 @@ fn generate_inner<'a, 'b>(p: &Parser<'a, 'b>, previous_command_name: &str) -> (S
format!("{}_{}", previous_command_name, &p.meta.name) format!("{}_{}", previous_command_name, &p.meta.name)
}; };
let mut subcommands_detection_cases = if previous_command_name == "" { let mut subcommands_detection_cases = if previous_command_name.is_empty() {
String::new() String::new()
} else { } else if !names.contains(&&*p.meta.name) {
names.push(&&*p.meta.name);
format!(r" format!(r"
'{0}' {{ '{0}' {{
$command += '_{0}' $command += '_{0}'
@ -91,6 +93,8 @@ fn generate_inner<'a, 'b>(p: &Parser<'a, 'b>, previous_command_name: &str) -> (S
}} }}
", ",
&p.meta.name) &p.meta.name)
} else {
String::new()
}; };
let mut completions = String::new(); let mut completions = String::new();
@ -114,7 +118,7 @@ fn generate_inner<'a, 'b>(p: &Parser<'a, 'b>, previous_command_name: &str) -> (S
for subcommand in &p.subcommands { for subcommand in &p.subcommands {
let (subcommand_subcommands_detection_cases, subcommand_subcommands_cases) = let (subcommand_subcommands_detection_cases, subcommand_subcommands_cases) =
generate_inner(&subcommand.p, &command_name); generate_inner(&subcommand.p, &command_name, names);
subcommands_detection_cases.push_str(&subcommand_subcommands_detection_cases); subcommands_detection_cases.push_str(&subcommand_subcommands_detection_cases);
subcommands_cases.push_str(&subcommand_subcommands_cases); subcommands_cases.push_str(&subcommand_subcommands_cases);
} }