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

fix: display visible short flags, visible flags

Browse source 
Flags weren't being set as visible in one instance. Flags were not being
printed in help message.
This commit is contained in:
NickHackman 2020-06-16 01:13:58 -04:00
parent 383606e099
commit 02ebf4f816
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/build/app/mod.rs
View file

@ -1022,7 +1022,7 @@ impl<'b> App<'b> {
if s == &'-' {
panic!("short alias name cannot be `-`");
}
self.short_flag_aliases.push((*s, false));
self.short_flag_aliases.push((*s, true));
}
self
}

27
src/output/help.rs
View file

@ -576,19 +576,26 @@ impl<'b, 'c, 'd, 'w> Help<'b, 'c, 'd, 'w> {
fn sc_spec_vals(&self, a: &App) -> String {
debug!("Help::sc_spec_vals: a={}", a.name);
let mut spec_vals = vec![];
if !a.aliases.is_empty() {
if !a.aliases.is_empty() || !a.short_flag_aliases.is_empty() {
debug!("Help::spec_vals: Found aliases...{:?}", a.aliases);
debug!(
"Help::spec_vals: Found short flag aliases...{:?}",
a.short_flag_aliases
);
let als = a
.aliases
.iter()
.filter(|&als| als.1) // visible
.map(|&als| als.0) // name
.collect::<Vec<_>>()
.join(", ");
let mut short_als = a
.get_visible_short_aliases()
.map(|a| format!("-{}", a))
.collect::<Vec<_>>();
if !als.is_empty() {
spec_vals.push(format!(" [aliases: {}]", als));
let als = a.get_visible_aliases().map(|s| s.to_string());
short_als.extend(als);
let all_als = short_als.join(", ");
if !all_als.is_empty() {
spec_vals.push(format!(" [aliases: {}]", all_als));
}
}
spec_vals.join(" ")