git.iko.soy/bat
on master help sign in
Add check for terminal-width in output_wrap config value in not interactive case
6311ca2fusillicode
src/bin/bat/app.rs+24−26
compare with master
unifiedsplit
@@ -119,6 +119,24 @@ impl App {
119 }
119 }
120 }
120 }
121
121
122+ let maybe_term_width = self.matches.value_of("terminal-width").and_then(|w| {
123+ if w.starts_with('+') || w.starts_with('-') {
124+ // Treat argument as a delta to the current terminal width
125+ w.parse().ok().map(|delta: i16| {
126+ let old_width: u16 = Term::stdout().size().1;
127+ let new_width: i32 = i32::from(old_width) + i32::from(delta);
128+
129+ if new_width <= 0 {
130+ old_width as usize
131+ } else {
132+ new_width as usize
133+ }
134+ })
135+ } else {
136+ w.parse().ok()
137+ }
138+ });
139+
122 Ok(Config {
140 Ok(Config {
123 true_color: is_truecolor_terminal(),
141 true_color: is_truecolor_terminal(),
124 language: self.matches.value_of("language").or_else(|| {
142 language: self.matches.value_of("language").or_else(|| {
@@ -129,11 +147,7 @@ impl App {
129 }
147 }
130 }),
148 }),
131 show_nonprintable: self.matches.is_present("show-all"),
149 show_nonprintable: self.matches.is_present("show-all"),
132− output_wrap: if !self.interactive_output {
150+ output_wrap: if self.interactive_output || maybe_term_width.is_some() {
133− // We don't have the tty width when piping to another program.
134− // There's no point in wrapping when this is the case.
135− OutputWrap::None
136− } else {
137 match self.matches.value_of("wrap") {
151 match self.matches.value_of("wrap") {
138 Some("character") => OutputWrap::Character,
152 Some("character") => OutputWrap::Character,
139 Some("never") => OutputWrap::None,
153 Some("never") => OutputWrap::None,
@@ -145,6 +159,10 @@ impl App {
145 }
159 }
146 }
160 }
147 }
161 }
162+ } else {
163+ // We don't have the tty width when piping to another program.
164+ // There's no point in wrapping when this is the case.
165+ OutputWrap::None
148 },
166 },
149 colored_output: match self.matches.value_of("color") {
167 colored_output: match self.matches.value_of("color") {
150 Some("always") => true,
168 Some("always") => true,
@@ -152,27 +170,7 @@ impl App {
152 Some("auto") | _ => self.interactive_output,
170 Some("auto") | _ => self.interactive_output,
153 },
171 },
154 paging_mode,
172 paging_mode,
155− term_width: self
156− .matches
157− .value_of("terminal-width")
158− .and_then(|w| {
159− if w.starts_with('+') || w.starts_with('-') {
160− // Treat argument as a delta to the current terminal width
161− w.parse().ok().map(|delta: i16| {
162− let old_width: u16 = Term::stdout().size().1;
163− let new_width: i32 = i32::from(old_width) + i32::from(delta);
164−
165− if new_width <= 0 {
166− old_width as usize
167− } else {
168− new_width as usize
169− }
170− })
171− } else {
172− w.parse().ok()
173− }
174− })
175− .unwrap_or(Term::stdout().size().1 as usize),
173+ term_width: maybe_term_width.unwrap_or(Term::stdout().size().1 as usize),
176 loop_through: !(self.interactive_output
174 loop_through: !(self.interactive_output
177 || self.matches.value_of("color") == Some("always")
175 || self.matches.value_of("color") == Some("always")
178 || self.matches.value_of("decorations") == Some("always")),
176 || self.matches.value_of("decorations") == Some("always")),