Mirrors/bat
2
0
Fork 0
mirror of https://github.com/sharkdp/bat synced 2024-12-18 00:03:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

src/printer.rs: Simplify Plain Text fallback code

Browse source 
By forwarding the task to find the `Plain Text` syntax to `assets`. Not only does
the code become simpler; we also get rid of a call to `self.get_syntax_set()`
which is beneficial to the long term goal of replacing `syntaxes.bin` with
`minimal_syntaxes.bin`.

Note that the use of `.expect()` is not a regression in error handling. It was
previously hidden in `.find_syntax_plain_text()`.
This commit is contained in:
Martin Nordholts 2021-09-27 20:09:26 +02:00
parent 405a80f3ee
commit aefc8fd824
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/assets.rs
View file

@ -245,7 +245,10 @@ impl HighlightingAssets {
} }
} }
fn find_syntax_by_name(&self, syntax_name: &str) -> Result<Option<SyntaxReferenceInSet>> { pub(crate) fn find_syntax_by_name(
&self,
syntax_name: &str,
) -> Result<Option<SyntaxReferenceInSet>> {
let syntax_set = self.get_syntax_set()?; let syntax_set = self.get_syntax_set()?;
Ok(syntax_set Ok(syntax_set
.find_syntax_by_name(syntax_name) .find_syntax_by_name(syntax_name)

8
src/printer.rs
View file

@ -187,11 +187,9 @@ impl<'a> InteractivePrinter<'a> {
let syntax_in_set = let syntax_in_set =
match assets.get_syntax(config.language, input, &config.syntax_mapping) { match assets.get_syntax(config.language, input, &config.syntax_mapping) {
Ok(syntax_in_set) => syntax_in_set, Ok(syntax_in_set) => syntax_in_set,
Err(Error::UndetectedSyntax(_)) => { Err(Error::UndetectedSyntax(_)) => assets
let syntax_set = assets.get_syntax_set()?; .find_syntax_by_name("Plain Text")?
let syntax = syntax_set.find_syntax_plain_text(); .expect("A plain text syntax is available"),
SyntaxReferenceInSet { syntax, syntax_set }
}
Err(e) => return Err(e), Err(e) => return Err(e),
}; };