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

Merge pull request #2359 from blyxxyz/fish-avoid-useless-subcommand-detection

Browse source 
fix: Do not look for subcommands in fish completion if none exist
This commit is contained in:
Pavan Kumar Sunkara 2021-02-22 16:02:38 +00:00 committed by GitHub
commit 69d32bca15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clap_generate/src/generators/shells/fish.rs
View file

@ -44,14 +44,17 @@ fn gen_fish_inner(root_command: &str, app: &App, buffer: &mut String) {
// -n "__fish_use_subcommand" # complete for command "myprog"
// -n "__fish_seen_subcommand_from subcmd1" # complete for command "myprog subcmd1"
let mut basic_template = format!("complete -c {} -n ", root_command);
let mut basic_template = format!("complete -c {}", root_command);
let mut bin_name = app.get_bin_name().unwrap();
if root_command == bin_name {
basic_template.push_str("\"__fish_use_subcommand\"");
if app.has_subcommands() {
basic_template.push_str(" -n \"__fish_use_subcommand\"");
}
} else {
bin_name = &app.get_name();
basic_template.push_str(format!("\"__fish_seen_subcommand_from {}\"", bin_name).as_str());
basic_template
.push_str(format!(" -n \"__fish_seen_subcommand_from {}\"", bin_name).as_str());
}
debug!("gen_fish_inner: bin_name={}", bin_name);

24
clap_generate/tests/completions/fish.rs
View file

@ -112,14 +112,14 @@ fn build_app_special_help() -> App<'static> {
)
}
static FISH_SPECIAL_HELP: &str = r#"complete -c my_app -n "__fish_use_subcommand" -s h -l help -d 'Prints help information'
complete -c my_app -n "__fish_use_subcommand" -s V -l version -d 'Prints version information'
complete -c my_app -n "__fish_use_subcommand" -l single-quotes -d 'Can be \'always\', \'auto\', or \'never\''
complete -c my_app -n "__fish_use_subcommand" -l double-quotes -d 'Can be "always", "auto", or "never"'
complete -c my_app -n "__fish_use_subcommand" -l backticks -d 'For more information see `echo test`'
complete -c my_app -n "__fish_use_subcommand" -l backslash -d 'Avoid \'\\n\''
complete -c my_app -n "__fish_use_subcommand" -l brackets -d 'List packages [filter]'
complete -c my_app -n "__fish_use_subcommand" -l expansions -d 'Execute the shell command with $SHELL'
static FISH_SPECIAL_HELP: &str = r#"complete -c my_app -s h -l help -d 'Prints help information'
complete -c my_app -s V -l version -d 'Prints version information'
complete -c my_app -l single-quotes -d 'Can be \'always\', \'auto\', or \'never\''
complete -c my_app -l double-quotes -d 'Can be "always", "auto", or "never"'
complete -c my_app -l backticks -d 'For more information see `echo test`'
complete -c my_app -l backslash -d 'Avoid \'\\n\''
complete -c my_app -l brackets -d 'List packages [filter]'
complete -c my_app -l expansions -d 'Execute the shell command with $SHELL'
"#;
#[test]
@ -151,8 +151,8 @@ fn build_app_with_aliases() -> App<'static> {
.arg(Arg::new("positional"))
}
static FISH_ALIASES: &str = r#"complete -c cmd -n "__fish_use_subcommand" -s o -s O -l option -l opt -d 'cmd option' -r
complete -c cmd -n "__fish_use_subcommand" -s h -l help -d 'Prints help information'
complete -c cmd -n "__fish_use_subcommand" -s V -l version -d 'Prints version information'
complete -c cmd -n "__fish_use_subcommand" -s f -s F -l flag -l flg -d 'cmd flag'
static FISH_ALIASES: &str = r#"complete -c cmd -s o -s O -l option -l opt -d 'cmd option' -r
complete -c cmd -s h -l help -d 'Prints help information'
complete -c cmd -s V -l version -d 'Prints version information'
complete -c cmd -s f -s F -l flag -l flg -d 'cmd flag'
"#;

28
clap_generate/tests/value_hints.rs
View file

@ -130,20 +130,20 @@ _my_app_commands() {
_my_app "$@""#;
static FISH_VALUE_HINTS: &str = r#"complete -c my_app -n "__fish_use_subcommand" -l choice -r -f -a "bash fish zsh"
complete -c my_app -n "__fish_use_subcommand" -l unknown -r
complete -c my_app -n "__fish_use_subcommand" -l other -r -f
complete -c my_app -n "__fish_use_subcommand" -s p -l path -r -F
complete -c my_app -n "__fish_use_subcommand" -s f -l file -r -F
complete -c my_app -n "__fish_use_subcommand" -s d -l dir -r -f -a "(__fish_complete_directories)"
complete -c my_app -n "__fish_use_subcommand" -s e -l exe -r -F
complete -c my_app -n "__fish_use_subcommand" -l cmd-name -r -f -a "(__fish_complete_command)"
complete -c my_app -n "__fish_use_subcommand" -s c -l cmd -r -f -a "(__fish_complete_command)"
complete -c my_app -n "__fish_use_subcommand" -s u -l user -r -f -a "(__fish_complete_users)"
complete -c my_app -n "__fish_use_subcommand" -s h -l host -r -f -a "(__fish_print_hostnames)"
complete -c my_app -n "__fish_use_subcommand" -l url -r -f
complete -c my_app -n "__fish_use_subcommand" -l email -r -f
complete -c my_app -n "__fish_use_subcommand" -l help -d 'Prints help information'
static FISH_VALUE_HINTS: &str = r#"complete -c my_app -l choice -r -f -a "bash fish zsh"
complete -c my_app -l unknown -r
complete -c my_app -l other -r -f
complete -c my_app -s p -l path -r -F
complete -c my_app -s f -l file -r -F
complete -c my_app -s d -l dir -r -f -a "(__fish_complete_directories)"
complete -c my_app -s e -l exe -r -F
complete -c my_app -l cmd-name -r -f -a "(__fish_complete_command)"
complete -c my_app -s c -l cmd -r -f -a "(__fish_complete_command)"
complete -c my_app -s u -l user -r -f -a "(__fish_complete_users)"
complete -c my_app -s h -l host -r -f -a "(__fish_print_hostnames)"
complete -c my_app -l url -r -f
complete -c my_app -l email -r -f
complete -c my_app -l help -d 'Prints help information'
"#;
#[test]