Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2025-01-22 01:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(complete): Use bin_name for subcommands

Browse source 
Bash completions for subcommands used package
name, which broke completions when the `bin_name`
was different.

Update the `custom_bin_name` test to reflect the
correct behavior.
This commit is contained in:
Sebastian Holmin 2024-01-19 10:25:30 +01:00
parent 6411995641
commit ba378e635c
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clap_complete/src/shells/bash.rs
View file

@ -18,6 +18,8 @@ impl Generator for Bash {
.get_bin_name() .get_bin_name()
.expect("crate::generate should have set the bin_name"); .expect("crate::generate should have set the bin_name");
let fn_name = bin_name.replace('-', "__");
w!( w!(
buf, buf,
format!( format!(
@ -65,10 +67,10 @@ else
fi fi
", ",
name = bin_name, name = bin_name,
cmd = bin_name.replace('-', "__"), cmd = fn_name,
name_opts = all_options_for_path(cmd, bin_name), name_opts = all_options_for_path(cmd, bin_name),
name_opts_details = option_details_for_path(cmd, bin_name), name_opts_details = option_details_for_path(cmd, bin_name),
subcmds = all_subcommands(cmd), subcmds = all_subcommands(cmd, &fn_name),
subcmd_details = subcommand_details(cmd) subcmd_details = subcommand_details(cmd)
) )
.as_bytes() .as_bytes()
@ -76,7 +78,7 @@ fi
} }
} }
fn all_subcommands(cmd: &Command) -> String { fn all_subcommands(cmd: &Command, parent_fn_name: &str) -> String {
debug!("all_subcommands"); debug!("all_subcommands");
fn add_command( fn add_command(
@ -106,9 +108,8 @@ fn all_subcommands(cmd: &Command) -> String {
} }
} }
let mut subcmds = vec![]; let mut subcmds = vec![];
let fn_name = cmd.get_name().replace('-', "__");
for subcmd in cmd.get_subcommands() { for subcmd in cmd.get_subcommands() {
add_command(&fn_name, subcmd, &mut subcmds); add_command(parent_fn_name, subcmd, &mut subcmds);
} }
subcmds.sort(); subcmds.sort();

16
clap_complete/tests/snapshots/custom_bin_name.bash
View file

@ -12,17 +12,17 @@ _bin-name() {
",$1") ",$1")
cmd="bin__name" cmd="bin__name"
;; ;;
my__app,help) bin__name,help)
cmd="my__app__help" cmd="bin__name__help"
;; ;;
my__app,test) bin__name,test)
cmd="my__app__test" cmd="bin__name__test"
;; ;;
my__app__help,help) bin__name__help,help)
cmd="my__app__help__help" cmd="bin__name__help__help"
;; ;;
my__app__help,test) bin__name__help,test)
cmd="my__app__help__test" cmd="bin__name__help__test"
;; ;;
*) *)
;; ;;