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

fix(Help Wrapping): fixes a regression-bug where the old {n} newline char stopped working

Browse source 
As of this commit, one can use the old newline character `{n}` or the new `\n`

Closes #661
This commit is contained in:
Kevin K 2016-09-12 23:19:26 -04:00
parent 804a60f781
commit 92ac353b48
No known key found for this signature in database
GPG key ID: 64FA5B74693EE1E5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/app/help.rs
View file

@ -353,7 +353,7 @@ impl<'a> Help<'a> {
let too_long = str_width(h) >= width;
debug!("Too long...");
if too_long {
if too_long || h.contains("{n}") {
sdebugln!("Yes");
help.push_str(h);
debugln!("help: {}", help);
@ -380,11 +380,11 @@ impl<'a> Help<'a> {
help.push_str(h);
&*help
};
if help.contains("{n}") {
if let Some(part) = help.split("{n}").next() {
if help.contains("\n") {
if let Some(part) = help.split("\n").next() {
try!(write!(self.writer, "{}", part));
}
for part in help.split("{n}").skip(1) {
for part in help.split("\n").skip(1) {
try!(write!(self.writer, "\n{}", part));
}
} else {
@ -432,7 +432,7 @@ impl<'a> Help<'a> {
}
debug!("Too long...");
if too_long && spcs <= width {
if too_long && spcs <= width || h.contains("{n}") {
sdebugln!("Yes");
help.push_str(h);
help.push_str(&*spec_vals);