Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-12 13:52:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(help): Respect LINES and COLUMNS

Browse source 
Fixes #4186
This commit is contained in:
Ed Page 2022-09-12 20:16:57 -05:00
parent 0760498200
commit 0eb95022a5
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -254,6 +254,9 @@ Deprecated
- *(derive)* `structopt` and `clap` attributes in favor of the more specific `command`, `arg`, and `value` to open the door for [more features](https://github.com/clap-rs/clap/issues/1807) and [clarify relationship to the builder](https://github.com/clap-rs/clap/discussions/4090) (#1807, #4180)
- *(derive)* `#[clap(value_parser)]` and `#[clap(action)]` defaulted attributes (its the default) (#3976)
Behavior Changes
- *(help)* With `wrap_help` feature, if the terminal size cannot be determined, `LINES` and `COLUMNS` variables are used (#4186)
### Features
- `Arg::num_args` now accepts ranges, allowing setting both the minimum and maximum number of values per occurrence (#2688, #4023)
@ -270,6 +273,7 @@ Deprecated
- `arg!(--long [value])` to accept `0..=1` per occurrence rather than across all occurrences, making it safe to use with `ArgAction::Append` (#4001)
- Allow `OsStr`s for `Arg::{required_if_eq,required_if_eq_any,required_if_eq_all}` (#4084)
- Can now pass runtime generated data to `Command`, `Arg`, `ArgGroup`, `PossibleValue`, etc without managing lifetimes
- *(help)* With `wrap_help` feature, if the terminal size cannot be determined, `LINES` and `COLUMNS` variables are used (#4186)
- *(help)* Use `Command::display_name` in the help title rather than `Command::bin_name`
- *(help)* Show when a flag is `ArgAction::Count` by adding an `...` (#4003)
- *(help)* Use a more neutral palette for coloring (#4132, #4117)

7
src/output/help.rs
View file

@ -969,7 +969,12 @@ pub(crate) fn dimensions() -> (Option<usize>, Option<usize>) {
#[cfg(feature = "wrap_help")]
terminal_size::terminal_size()
.map(|(w, h)| (Some(w.0.into()), Some(h.0.into())))
.unwrap_or((None, None))
.unwrap_or_else(|| (parse_env("COLUMNS"), parse_env("LINES")))
}
#[cfg(feature = "wrap_help")]
fn parse_env(var: &str) -> Option<usize> {
std::env::var_os(var)?.to_str()?.parse::<usize>().ok()
}
fn should_show_arg(use_long: bool, arg: &Arg) -> bool {