Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-11-10 14:54:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor(help): Only trim the end on usage

Browse source
This commit is contained in:
Ed Page 2023-11-08 11:42:54 -06:00
parent f04f04111b
commit f50800f763
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clap_builder/src/builder/styled_str.rs
View file

@ -45,10 +45,6 @@ impl StyledStr {
self.0.push_str(msg);
}
pub(crate) fn trim(&mut self) {
self.0 = self.0.trim().to_owned()
}
pub(crate) fn trim_start_lines(&mut self) {
if let Some(pos) = self.0.find('\n') {
let (leading, help) = self.0.split_at(pos + 1);

21
clap_builder/src/output/usage.rs
View file

@ -68,7 +68,7 @@ impl<'cmd> Usage<'cmd> {
} else {
self.write_smart_usage(&mut styled, used);
}
styled.trim();
styled.trim_end();
debug!("Usage::create_usage_no_title: usage={styled}");
Some(styled)
}
@ -99,7 +99,7 @@ impl<'cmd> Usage<'cmd> {
// the trim won't properly remove a leading space due to the formatting
let _ = write!(
styled,
"{}{name}{}",
"{}{name}{} ",
literal.render(),
literal.render_reset()
);
@ -108,7 +108,7 @@ impl<'cmd> Usage<'cmd> {
if self.needs_options_tag() {
let _ = write!(
styled,
"{} [OPTIONS]{}",
"{}[OPTIONS]{} ",
placeholder.render(),
placeholder.render_reset()
);
@ -127,12 +127,13 @@ impl<'cmd> Usage<'cmd> {
if self.cmd.is_subcommand_negates_reqs_set()
|| self.cmd.is_args_conflicts_with_subcommands_set()
{
styled.trim_end();
let _ = write!(styled, "{}", USAGE_SEP);
if self.cmd.is_args_conflicts_with_subcommands_set() {
// Short-circuit full usage creation since no args will be relevant
let _ = write!(
styled,
"{}{name}{}",
"{}{name}{} ",
literal.render(),
literal.render_reset()
);
@ -141,21 +142,21 @@ impl<'cmd> Usage<'cmd> {
}
let _ = write!(
styled,
" {}<{value_name}>{}",
"{}<{value_name}>{}",
placeholder.render(),
placeholder.render_reset()
);
} else if self.cmd.is_subcommand_required_set() {
let _ = write!(
styled,
" {}<{value_name}>{}",
"{}<{value_name}>{}",
placeholder.render(),
placeholder.render_reset()
);
} else {
let _ = write!(
styled,
" {}[{value_name}]{}",
"{}[{value_name}]{}",
placeholder.render(),
placeholder.render_reset()
);
@ -178,7 +179,7 @@ impl<'cmd> Usage<'cmd> {
.unwrap_or_else(|| self.cmd.get_name());
let _ = write!(
styled,
"{}{bin_name}{}",
"{}{bin_name}{} ",
literal.render(),
literal.render_reset()
);
@ -192,7 +193,7 @@ impl<'cmd> Usage<'cmd> {
.unwrap_or(DEFAULT_SUB_VALUE_NAME);
let _ = write!(
styled,
" {}<{value_name}>{}",
"{}<{value_name}>{}",
placeholder.render(),
placeholder.render_reset()
);
@ -252,8 +253,8 @@ impl<'cmd> Usage<'cmd> {
// Returns the required args in usage string form by fully unrolling all groups
pub(crate) fn write_args(&self, incls: &[Id], force_optional: bool, styled: &mut StyledStr) {
for required in self.get_args(incls, force_optional) {
styled.push_str(" ");
styled.push_styled(&required);
styled.push_str(" ");
}
}