mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-06 02:25:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crosvm: Logic for newline for help message.

Browse source 
Now we know the exact line size of the leading part of the help message
we can do a better logic for inserting a newline.

BUG=None
TEST=unit

Change-Id: Ia29ea9876199cfcef4cb97dd64eecbc71c6bcd60
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3581829
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Junichi Uekawa <uekawa@chromium.org>
This commit is contained in:
Junichi Uekawa 2022-04-12 12:17:51 +09:00 committed by Chromeos LUCI
parent 90f58ccc27
commit e8d38a6a8f
1 changed files with 67 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/argument.rs
View file

@ -413,6 +413,29 @@ fn reflow(s: &str, offset: usize, width: usize) -> String {
}
}
/// Obtain the leading part of the help message. The output is later processed
/// to reflow. Depending on how short this, newline is used.
fn get_leading_part(arg: &Argument) -> String {
[
match arg.short {
Some(s) => format!(" -{}, ", s),
None => " ".to_string(),
},
if arg.long.is_empty() {
" ".to_string()
} else {
"--".to_string()
},
format!("{:<12}", arg.long),
if let Some(v) = arg.value {
format!("{}{:<9} ", if arg.long.is_empty() { " " } else { "=" }, v)
} else {
" ".to_string()
},
]
.join("")
}
/// Prints command line usage information to stdout.
///
/// Usage information is printed according to the help fields in `args` with a leading usage line.
@ -435,26 +458,13 @@ pub fn print_help(program_name: &str, required_arg: &str, args: &[Argument]) {
println!("Argument{}:", if args.len() > 1 { "s" } else { "" });
for arg in args {
let leading_part = [
match arg.short {
Some(s) => format!(" -{}, ", s),
None => " ".to_string(),
},
if arg.long.is_empty() {
" ".to_string()
} else {
"--".to_string()
},
format!("{:<12}", arg.long),
if let Some(v) = arg.value {
format!("{}{:<10}", if arg.long.is_empty() { " " } else { "=" }, v)
} else {
format!("{:<11}", "")
},
]
.join("");
let leading_part = get_leading_part(arg);
if leading_part.len() <= indent_depth {
print!("{}", leading_part);
print!(
"{}{}",
leading_part,
" ".repeat(indent_depth - leading_part.len())
);
} else {
print!("{}\n{}", leading_part, " ".repeat(indent_depth));
}
@ -849,4 +859,42 @@ I am going to give you another paragraph. However I don't know if it is useful",
is useful"
);
}
#[test]
fn get_leading_part_short() {
assert_eq!(
get_leading_part(&Argument::positional("FILES", "files to operate on")).len(),
30
);
assert_eq!(
get_leading_part(&Argument::flag_or_value(
"gpu",
"[2D|3D]",
"Enable or configure gpu"
))
.len(),
30
);
assert_eq!(
get_leading_part(&Argument::flag("foo", "Enable foo.")).len(),
20
);
assert_eq!(
get_leading_part(&Argument::value("bar", "stuff", "Configure bar.")).len(),
30
);
}
#[test]
fn get_leading_part_long() {
assert_eq!(
get_leading_part(&Argument::value(
"very-long-flag-name",
"stuff",
"Configure bar."
))
.len(),
37
);
}
}