MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-09-11 07:42:35 +01:00
Code Issues Releases Wiki Activity

Handle file extension conflicts in --list-languages

Browse Source
This commit is contained in:
Kienyew
2020-09-06 20:08:13 +08:00
committed by David Peter
parent 31fb7087f1
commit c477e23fe9
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/assets.rs
View File

@@ -170,6 +170,21 @@ impl HighlightingAssets {
self.theme_set.themes.keys().map(|s| s.as_ref())
}
pub fn syntax_for_file_name(
&self,
file_name: impl AsRef<Path>,
mapping: &SyntaxMapping,
) -> Option<&SyntaxReference> {
let file_name = file_name.as_ref();
match mapping.get_syntax_for(file_name) {
Some(MappingTarget::MapToUnknown) => None,
Some(MappingTarget::MapTo(syntax_name)) => {
self.syntax_set.find_syntax_by_name(syntax_name)
}
None => self.get_extension_syntax(file_name.as_os_str()),
}
}
pub(crate) fn get_theme(&self, theme: &str) -> &Theme {
match self.theme_set.themes.get(theme) {
Some(theme) => theme,