Skip to content

Commit

Permalink
Skip syntax parsing when color output disabled
Browse files Browse the repository at this point in the history
  • Loading branch information
eth-p committed Feb 12, 2024
1 parent c94cf4e commit 25b5a41
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
- Pull in fix for unsafe-libyaml security advisory, see #2812 (@dtolnay)
- Update git-version dependency to use Syn v2, see #2816 (@dtolnay)
- Update git2 dependency to v0.18.2, see #2852 (@eth-p)
- Improve performance when color output disabled, see #2397 and #2857 (@eth-p)

## Syntaxes

Expand Down
25 changes: 22 additions & 3 deletions src/printer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use bytesize::ByteSize;

use syntect::easy::HighlightLines;
use syntect::highlighting::Color;
use syntect::highlighting::FontStyle;
use syntect::highlighting::Theme;
use syntect::parsing::SyntaxSet;

Expand Down Expand Up @@ -48,6 +49,22 @@ const ANSI_UNDERLINE_DISABLE: EscapeSequence = EscapeSequence::CSI {
final_byte: "m",
};

const EMPTY_SYNTECT_STYLE: syntect::highlighting::Style = syntect::highlighting::Style {
foreground: Color {
r: 127,
g: 127,
b: 127,
a: 255,
},
background: Color {
r: 127,
g: 127,
b: 127,
a: 255,
},
font_style: FontStyle::empty(),
};

pub enum OutputHandle<'a> {
IoWrite(&'a mut dyn io::Write),
FmtWrite(&'a mut dyn fmt::Write),
Expand Down Expand Up @@ -222,11 +239,13 @@ impl<'a> InteractivePrinter<'a> {
panel_width = 0;
}

let highlighter_from_set = if input
// Get the highlighter for the output.
let is_printing_binary = input
.reader
.content_type
.map_or(false, |c| c.is_binary() && !config.show_nonprintable)
{
.map_or(false, |c| c.is_binary() && !config.show_nonprintable);

let highlighter_from_set = if is_printing_binary || config.colored_output == false {
None
} else {
// Determine the type of syntax for highlighting
Expand Down

0 comments on commit 25b5a41

Please sign in to comment.