rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2024-12-12 19:18:24 +02:00
Code Issues Releases Activity

Only emit bold ANSI code if bold is true.

Browse Source 
This was a simple logic error. Also, avoid emitting ANSI escape codes
if there are no color settings.

Fixes #242
This commit is contained in:
Andrew Gallant 2016-11-21 20:33:15 -05:00
parent a5e7f176f1
commit ae592b11e3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/printer.rs
View File

@ -260,7 +260,7 @@ impl<W: WriteColor> Printer<W> {
} }
fn write_matched_line(&mut self, re: &Regex, buf: &[u8]) { fn write_matched_line(&mut self, re: &Regex, buf: &[u8]) {
if !self.wtr.supports_color() { if !self.wtr.supports_color() || self.colors.matched().is_none() {
self.write(buf); self.write(buf);
return; return;
} }

7
termcolor/src/lib.rs
View File

@ -764,7 +764,7 @@ impl<W: io::Write> WriteColor for Ansi<W> {
if let Some(ref c) = spec.bg_color { if let Some(ref c) = spec.bg_color {
try!(self.write_color(false, c, spec.bold)); try!(self.write_color(false, c, spec.bold));
} }
if spec.fg_color.is_none() && spec.bg_color.is_none() { if spec.bold && spec.fg_color.is_none() && spec.bg_color.is_none() {
try!(self.write_str("\x1B[1m")); try!(self.write_str("\x1B[1m"));
} }
Ok(()) Ok(())
@ -969,6 +969,11 @@ impl ColorSpec {
self self
} }
/// Returns true if this color specification has no colors or styles.
pub fn is_none(&self) -> bool {
self.fg_color.is_none() && self.bg_color.is_none() && !self.bold
}
/// Clears this color specification so that it has no color/style settings. /// Clears this color specification so that it has no color/style settings.
pub fn clear(&mut self) { pub fn clear(&mut self) {
self.fg_color = None; self.fg_color = None;