diff options
author | Kienyew <aobi100bt@hotmail.com> | 2020-09-06 17:29:34 +0800 |
---|---|---|
committer | David Peter <sharkdp@users.noreply.github.com> | 2020-09-20 12:14:21 +0200 |
commit | 31fb7087f176d559858d251d94e0b9b824f20183 (patch) | |
tree | 7983c217ccd6ebbdd2dc35909a7b731506a4fbaa /src | |
parent | 6bc477e88fc2462c1fdb5f92946766a88029c222 (diff) |
Revert to previous commit
Diffstat (limited to 'src')
-rw-r--r-- | src/bin/bat/main.rs | 13 | ||||
-rw-r--r-- | src/syntax_mapping.rs | 20 |
2 files changed, 6 insertions, 27 deletions
diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs index 2c6679d9..65129fa7 100644 --- a/src/bin/bat/main.rs +++ b/src/bin/bat/main.rs @@ -86,19 +86,6 @@ pub fn list_languages(config: &Config) -> Result<()> { .filter(|syntax| !syntax.hidden && !syntax.file_extensions.is_empty()) .cloned() .collect::<Vec<_>>(); - - for lang in languages.iter_mut() { - let lang_name = lang.name.clone(); - lang.file_extensions.retain(|extension| { - let test_file = Path::new("test").with_extension(extension); - match config.syntax_mapping.get_syntax_for(test_file) { - Some(MappingTarget::MapTo(primary_lang)) => lang_name == primary_lang, - Some(MappingTarget::MapToUnknown) => false, - None => true, - } - }); - } - languages.sort_by_key(|lang| lang.name.to_uppercase()); let configured_languages = get_syntax_mapping_to_paths(config.syntax_mapping.mappings()); diff --git a/src/syntax_mapping.rs b/src/syntax_mapping.rs index 84558ede..96ce7fc6 100644 --- a/src/syntax_mapping.rs +++ b/src/syntax_mapping.rs @@ -25,12 +25,6 @@ impl<'a> SyntaxMapping<'a> { 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(); mapping @@ -98,16 +92,14 @@ 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 } @@ -125,7 +117,7 @@ impl<'a> SyntaxMapping<'a> { &self.mappings } - pub fn get_syntax_for(&self, path: impl AsRef<Path>) -> Option<MappingTarget<'a>> { + pub(crate) 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() { |