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

Handle file extension conflicts in --list-languages (#1076)

Browse Source
This commit is contained in:
Kienyew
2020-08-08 12:01:02 +08:00
committed by David Peter
parent a4ffc9d5ed
commit f97634011e
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/syntax_mapping.rs
View File

@@ -24,6 +24,12 @@ impl<'a> SyntaxMapping<'a> {
let mut mapping = Self::empty();
mapping.insert("*.h", MappingTarget::MapTo("C++")).unwrap();
mapping.insert("*.fs", MappingTarget::MapTo("F#")).unwrap();
mapping
.insert("*.js", MappingTarget::MapTo("JavaScript (Babel)"))
.unwrap();
mapping
.insert("*.sass", MappingTarget::MapTo("Sass"))
.unwrap();
mapping
.insert("build", MappingTarget::MapToUnknown)
.unwrap();
@@ -92,14 +98,16 @@ impl<'a> SyntaxMapping<'a> {
"*.swap",
"*.target",
"*.timer",
].iter() {
mapping
.insert(glob, MappingTarget::MapTo("INI"))
.unwrap();
]
.iter()
{
mapping.insert(glob, MappingTarget::MapTo("INI")).unwrap();
}
// pacman hooks
mapping.insert("*.hook", MappingTarget::MapTo("INI")).unwrap();
mapping
.insert("*.hook", MappingTarget::MapTo("INI"))
.unwrap();
mapping
}
@@ -117,7 +125,7 @@ impl<'a> SyntaxMapping<'a> {
&self.mappings
}
pub(crate) fn get_syntax_for(&self, path: impl AsRef<Path>) -> Option<MappingTarget<'a>> {
pub fn get_syntax_for(&self, path: impl AsRef<Path>) -> Option<MappingTarget<'a>> {
let candidate = Candidate::new(path.as_ref());
let candidate_filename = path.as_ref().file_name().map(Candidate::new);
for (ref glob, ref syntax) in self.mappings.iter().rev() {