extern/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-04-09 20:28:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/printer.rs: Add HighlighterFromSet helper

Browse Source 
The main benefit is that we get rid of a call to `assets.get_syntax_set()`,
which in turn makes it easier to later get rid of `syntaxes.bin`.
This commit is contained in:
Martin Nordholts 2021-09-21 08:23:18 +02:00
parent 0994f3783f
commit eb3b3b9f8d
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/printer.rs
View File

@ -99,6 +99,20 @@ impl<'a> Printer for SimplePrinter<'a> {
} }
} }
struct HighlighterFromSet<'a> {
highlighter: HighlightLines<'a>,
syntax_set: &'a SyntaxSet,
}
impl<'a> HighlighterFromSet<'a> {
fn new(syntax_in_set: SyntaxReferenceInSet<'a>, theme: &'a Theme) -> Self {
Self {
highlighter: HighlightLines::new(syntax_in_set.syntax, theme),
syntax_set: syntax_in_set.syntax_set,
}
}
}
pub(crate) struct InteractivePrinter<'a> { pub(crate) struct InteractivePrinter<'a> {
colors: Colors, colors: Colors,
config: &'a Config<'a>, config: &'a Config<'a>,
@ -108,8 +122,7 @@ pub(crate) struct InteractivePrinter<'a> {
content_type: Option<ContentType>, content_type: Option<ContentType>,
#[cfg(feature = "git")] #[cfg(feature = "git")]
pub line_changes: &'a Option<LineChanges>, pub line_changes: &'a Option<LineChanges>,
highlighter: Option<HighlightLines<'a>>, highlighter_from_set: Option<HighlighterFromSet<'a>>,
syntax_set: &'a SyntaxSet,
background_color_highlight: Option<Color>, background_color_highlight: Option<Color>,
} }
@ -163,12 +176,12 @@ impl<'a> InteractivePrinter<'a> {
panel_width = 0; panel_width = 0;
} }
let (highlighter, syntax_set) = if input let highlighter_from_set = if input
.reader .reader
.content_type .content_type
.map_or(false, |c| c.is_binary() && !config.show_nonprintable) .map_or(false, |c| c.is_binary() && !config.show_nonprintable)
{ {
(None, assets.get_syntax_set()?) None
} else { } else {
// Determine the type of syntax for highlighting // Determine the type of syntax for highlighting
let syntax_in_set = let syntax_in_set =
@ -182,10 +195,7 @@ impl<'a> InteractivePrinter<'a> {
Err(e) => return Err(e), Err(e) => return Err(e),
}; };
( Some(HighlighterFromSet::new(syntax_in_set, theme))
Some(HighlightLines::new(syntax_in_set.syntax, theme)),
syntax_in_set.syntax_set,
)
}; };
Ok(InteractivePrinter { Ok(InteractivePrinter {
@ -197,8 +207,7 @@ impl<'a> InteractivePrinter<'a> {
ansi_prefix_sgr: String::new(), ansi_prefix_sgr: String::new(),
#[cfg(feature = "git")] #[cfg(feature = "git")]
line_changes, line_changes,
highlighter, highlighter_from_set,
syntax_set,
background_color_highlight, background_color_highlight,
}) })
} }
@ -389,13 +398,15 @@ impl<'a> Printer for InteractivePrinter<'a> {
}; };
let regions = { let regions = {
let highlighter = match self.highlighter { let highlighter_from_set = match self.highlighter_from_set {
Some(ref mut highlighter) => highlighter, Some(ref mut highlighter_from_set) => highlighter_from_set,
_ => { _ => {
return Ok(()); return Ok(());
} }
}; };
highlighter.highlight(&line, self.syntax_set) highlighter_from_set
.highlighter
.highlight(&line, highlighter_from_set.syntax_set)
}; };
if out_of_range { if out_of_range {