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

fix(help): fixes bug where space between arg and help is too long

Browse source
This commit is contained in:
Kevin K 2015-05-05 17:46:09 -04:00
parent f8b26b13da
commit 632fb11514
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/app.rs
View file

@ -962,17 +962,15 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
.values() .values()
.filter(|ref f| f.long.is_some()) .filter(|ref f| f.long.is_some())
// 2='--' // 2='--'
.map(|ref a| a.long.unwrap().len() + 2) { .map(|ref a| a.to_string().len() ) {
if fl > longest_flag { longest_flag = fl; } if fl > longest_flag { longest_flag = fl; }
} }
let mut longest_opt= 0; let mut longest_opt= 0;
for ol in self.opts for ol in self.opts
.values() .values()
.filter(|ref o| o.long.is_some()) .filter(|ref o| o.long.is_some())
// 3='...'
// 5='-- <>'
.map(|ref a| .map(|ref a|
if a.multiple { 3 } else { 0 } + a.long.unwrap().len() + 5 + a.name.len() a.to_string().len() + if a.short.is_some() { 4 } else { 0 }
) { ) {
if ol > longest_opt { if ol > longest_opt {
longest_opt = ol; longest_opt = ol;
@ -984,16 +982,14 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
.filter(|ref o| o.short.is_some()) .filter(|ref o| o.short.is_some())
// 3='...' // 3='...'
// 4='- <>' // 4='- <>'
.map(|ref a| format!("{}",a).len() + if a.short.is_some() && .map(|ref a| a.to_string().len() + if a.long.is_some() { 4 } else { 0 }) {
a.long.is_some() { 4 }
else { 0 }) {
if ol > longest_opt {longest_opt = ol;} if ol > longest_opt {longest_opt = ol;}
} }
} }
let mut longest_pos = 0; let mut longest_pos = 0;
for pl in self.positionals_idx for pl in self.positionals_idx
.values() .values()
.map(|ref f| if f.multiple { f.name.len() + 3 } else { f.name.len() } ) { .map(|ref f| f.to_string().len() ) {
if pl > longest_pos {longest_pos = pl;} if pl > longest_pos {longest_pos = pl;}
} }
let mut longest_sc = 0; let mut longest_sc = 0;
@ -1026,7 +1022,6 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
format!("{}--{}{}", format!("{}--{}{}",
if v.short.is_some() { ", " } else {""}, if v.short.is_some() { ", " } else {""},
l, l,
// 2='--'
self.get_spaces((longest_flag + 4) - (v.long.unwrap().len() + 2))) self.get_spaces((longest_flag + 4) - (v.long.unwrap().len() + 2)))
} else { } else {
// 6 is tab (4) + -- (2) // 6 is tab (4) + -- (2)
@ -1043,7 +1038,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
println!("{}{}{}{}{}{}",tab, println!("{}{}{}{}{}{}",tab,
if let Some(s) = v.short{format!("-{}",s)}else{tab.to_owned()}, if let Some(s) = v.short{format!("-{}",s)}else{tab.to_owned()},
if let Some(l) = v.long { if let Some(l) = v.long {
format!("{}--{} ", format!("{}--{}",
if v.short.is_some() {", "} else {""},l) if v.short.is_some() {", "} else {""},l)
} else { } else {
"".to_owned() "".to_owned()
@ -1062,11 +1057,11 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
}), }),
if v.long.is_some() { if v.long.is_some() {
self.get_spaces( self.get_spaces(
(longest_opt + 4) - (format!("{}",v).len()) (longest_opt + 4) - (v.to_string().len())
) )
} else { } else {
// 8 = tab + '-a, '.len() // 8 = tab + '-a, '.len()
self.get_spaces((longest_opt + 9) - (format!("{}", v).len())) self.get_spaces((longest_opt + 9) - (v.to_string().len()))
}, },
get_help!(v) ); get_help!(v) );
} }