tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/cli/completion.rs - get_simple_completion: remove all_arg_param parameters 

Seems useless.
This commit is contained in:
Dietmar Maurer 2019-12-02 08:31:03 +01:00
parent 28c855c0a2
commit 2348e77edf
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cli/completion.rs
View File

@ -53,7 +53,6 @@ fn get_property_completion(
fn get_simple_completion( fn get_simple_completion(
cli_cmd: &CliCommand, cli_cmd: &CliCommand,
done: &mut HashMap<String, String>, done: &mut HashMap<String, String>,
all_arg_param: &[&str], // this is always the full list
arg_param: &[&str], // we remove done arguments arg_param: &[&str], // we remove done arguments
args: &[String], args: &[String],
) -> Vec<String> { ) -> Vec<String> {
@ -64,7 +63,7 @@ fn get_simple_completion(
let prop_name = arg_param[0]; let prop_name = arg_param[0];
if args.len() > 1 { if args.len() > 1 {
record_done_argument(done, cli_cmd.info.parameters, prop_name, &args[0]); record_done_argument(done, cli_cmd.info.parameters, prop_name, &args[0]);
return get_simple_completion(cli_cmd, done, arg_param, &arg_param[1..], &args[1..]); return get_simple_completion(cli_cmd, done, &arg_param[1..], &args[1..]);
} else if args.len() == 1 { } else if args.len() == 1 {
record_done_argument(done, cli_cmd.info.parameters, prop_name, &args[0]); record_done_argument(done, cli_cmd.info.parameters, prop_name, &args[0]);
if let Some((_, schema)) = cli_cmd.info.parameters.lookup(prop_name) { if let Some((_, schema)) = cli_cmd.info.parameters.lookup(prop_name) {
@ -101,7 +100,7 @@ fn get_simple_completion(
let mut completions = Vec::new(); let mut completions = Vec::new();
for (name, _optional, _schema) in cli_cmd.info.parameters.properties { for (name, _optional, _schema) in cli_cmd.info.parameters.properties {
if done.contains_key(*name) { continue; } if done.contains_key(*name) { continue; }
if all_arg_param.contains(name) { continue; } if cli_cmd.arg_param.contains(name) { continue; }
let option = String::from("--") + name; let option = String::from("--") + name;
if option.starts_with(prefix) { if option.starts_with(prefix) {
completions.push(option); completions.push(option);
@ -120,7 +119,7 @@ fn get_help_completion(
match def { match def {
CommandLineInterface::Simple(_) => { CommandLineInterface::Simple(_) => {
return get_simple_completion(help_cmd, &mut done, help_cmd.arg_param, &[], args); return get_simple_completion(help_cmd, &mut done, &[], args);
} }
CommandLineInterface::Nested(map) => { CommandLineInterface::Nested(map) => {
if args.is_empty() { if args.is_empty() {
@ -161,7 +160,7 @@ fn get_nested_completion(
cli_cmd.fixed_param.iter().for_each(|(key, value)| { cli_cmd.fixed_param.iter().for_each(|(key, value)| {
record_done_argument(&mut done, &cli_cmd.info.parameters, &key, &value); record_done_argument(&mut done, &cli_cmd.info.parameters, &key, &value);
}); });
return get_simple_completion(cli_cmd, &mut done, cli_cmd.arg_param, &cli_cmd.arg_param, args); return get_simple_completion(cli_cmd, &mut done, &cli_cmd.arg_param, args);
} }
CommandLineInterface::Nested(map) => { CommandLineInterface::Nested(map) => {
if args.is_empty() { if args.is_empty() {