extern/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-01-16 18:48:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

HighlightingAssets: Move common get_extension_syntax() code into find_syntax_by_extension()

Browse Source
This commit is contained in:
Martin Nordholts 2021-09-18 06:50:54 +02:00
parent 974dec38e3
commit 0994f3783f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/assets.rs
View File

@ -250,22 +250,18 @@ impl HighlightingAssets {
.map(|syntax| SyntaxReferenceInSet { syntax, syntax_set })) .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set }))
} }
fn find_syntax_by_extension(&self, extension: &str) -> Result<Option<SyntaxReferenceInSet>> { fn find_syntax_by_extension(&self, e: Option<&OsStr>) -> Result<Option<SyntaxReferenceInSet>> {
let syntax_set = self.get_syntax_set()?; let syntax_set = self.get_syntax_set()?;
let extension = e.and_then(|x| x.to_str()).unwrap_or_default();
Ok(syntax_set Ok(syntax_set
.find_syntax_by_extension(extension) .find_syntax_by_extension(extension)
.map(|syntax| SyntaxReferenceInSet { syntax, syntax_set })) .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set }))
} }
fn get_extension_syntax(&self, file_name: &OsStr) -> Result<Option<SyntaxReferenceInSet>> { fn get_extension_syntax(&self, file_name: &OsStr) -> Result<Option<SyntaxReferenceInSet>> {
let mut syntax = self.find_syntax_by_extension(file_name.to_str().unwrap_or_default())?; let mut syntax = self.find_syntax_by_extension(Some(file_name))?;
if syntax.is_none() { if syntax.is_none() {
syntax = self.find_syntax_by_extension( syntax = self.find_syntax_by_extension(Path::new(file_name).extension())?;
Path::new(file_name)
.extension()
.and_then(|x| x.to_str())
.unwrap_or_default(),
)?;
} }
if syntax.is_none() { if syntax.is_none() {
syntax = try_with_stripped_suffix(file_name, |stripped_file_name| { syntax = try_with_stripped_suffix(file_name, |stripped_file_name| {