Robot
/
bat
mirror of https://github.com/sharkdp/bat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HighlightingAssets::get_extension_syntax(): Split up into smaller methods 

To make the code easier to understand and change.
This commit is contained in:
Martin Nordholts 2021-07-27 18:53:28 +02:00
parent ccf4563573
commit c0e09662b4
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/assets.rs
View File

@ -251,29 +251,42 @@ impl HighlightingAssets {
} }
fn get_extension_syntax(&self, file_name: &OsStr) -> Option<&SyntaxReference> { fn get_extension_syntax(&self, file_name: &OsStr) -> Option<&SyntaxReference> {
self.find_syntax_by_file_name(file_name).or_else(|| {
self.find_syntax_by_file_name_extension(file_name)
.or_else(|| self.get_extension_syntax_with_stripped_suffix(file_name))
})
}
fn find_syntax_by_file_name(&self, file_name: &OsStr) -> Option<&SyntaxReference> {
self.get_syntax_set() self.get_syntax_set()
.find_syntax_by_extension(file_name.to_str().unwrap_or_default()) .find_syntax_by_extension(file_name.to_str().unwrap_or_default())
.or_else(|| { }
let file_path = Path::new(file_name);
self.get_syntax_set() fn find_syntax_by_file_name_extension(&self, file_name: &OsStr) -> Option<&SyntaxReference> {
.find_syntax_by_extension( let file_path = Path::new(file_name);
file_path self.get_syntax_set().find_syntax_by_extension(
.extension() file_path
.and_then(|x| x.to_str()) .extension()
.unwrap_or_default(), .and_then(|x| x.to_str())
) .unwrap_or_default(),
.or_else(|| { )
if let Some(file_str) = file_path.to_str() { }
for suffix in IGNORED_SUFFIXES.iter() {
if let Some(stripped_filename) = file_str.strip_suffix(suffix) { /// If we find an ignored suffix on the file name, e.g. '~', we strip it and
return self /// then try again to find a syntax without it. Note that we do this recursively.
.get_extension_syntax(OsStr::new(stripped_filename)); fn get_extension_syntax_with_stripped_suffix(
} &self,
} file_name: &OsStr,
} ) -> Option<&SyntaxReference> {
None let file_path = Path::new(file_name);
}) if let Some(file_str) = file_path.to_str() {
}) for suffix in IGNORED_SUFFIXES.iter() {
if let Some(stripped_filename) = file_str.strip_suffix(suffix) {
return self.get_extension_syntax(OsStr::new(stripped_filename));
}
}
}
None
} }
fn get_first_line_syntax(&self, reader: &mut InputReader) -> Option<&SyntaxReference> { fn get_first_line_syntax(&self, reader: &mut InputReader) -> Option<&SyntaxReference> {