git.iko.soy/bat
on master help sign in
Revert to previous commit
commit31fb7087f176d559858d251d94e0b9b824f20183 authorKienyew <aobi100bt@hotmail.com> dateSun 6 Sep 2020, 17:29 (6 years ago) parent6bc477e
2 files changed+6−27
compare with master
unifiedsplit
src/bin/bat/main.rs−13 src/syntax_mapping.rs+6−14
src/bin/bat/main.rs−13
@@ -86,19 +86,6 @@ pub fn list_languages(config: &Config) -> Result<()> {
8686 .filter(|syntax| !syntax.hidden && !syntax.file_extensions.is_empty())
8787 .cloned()
8888 .collect::<Vec<_>>();
89−
90− for lang in languages.iter_mut() {
91− let lang_name = lang.name.clone();
92− lang.file_extensions.retain(|extension| {
93− let test_file = Path::new("test").with_extension(extension);
94− match config.syntax_mapping.get_syntax_for(test_file) {
95− Some(MappingTarget::MapTo(primary_lang)) => lang_name == primary_lang,
96− Some(MappingTarget::MapToUnknown) => false,
97− None => true,
98− }
99− });
100− }
101−
10289 languages.sort_by_key(|lang| lang.name.to_uppercase());
10390
10491 let configured_languages = get_syntax_mapping_to_paths(config.syntax_mapping.mappings());
src/syntax_mapping.rs+6−14
@@ -24,12 +24,6 @@ impl<'a> SyntaxMapping<'a> {
2424 let mut mapping = Self::empty();
2525 mapping.insert("*.h", MappingTarget::MapTo("C++")).unwrap();
2626 mapping.insert("*.fs", MappingTarget::MapTo("F#")).unwrap();
27− mapping
28− .insert("*.js", MappingTarget::MapTo("JavaScript (Babel)"))
29− .unwrap();
30− mapping
31− .insert("*.sass", MappingTarget::MapTo("Sass"))
32− .unwrap();
3327 mapping
3428 .insert("build", MappingTarget::MapToUnknown)
3529 .unwrap();
@@ -98,16 +92,14 @@ impl<'a> SyntaxMapping<'a> {
9892 "*.swap",
9993 "*.target",
10094 "*.timer",
101− ]
102− .iter()
103− {
104− mapping.insert(glob, MappingTarget::MapTo("INI")).unwrap();
95+ ].iter() {
96+ mapping
97+ .insert(glob, MappingTarget::MapTo("INI"))
98+ .unwrap();
10599 }
106100
107101 // pacman hooks
108− mapping
109− .insert("*.hook", MappingTarget::MapTo("INI"))
110− .unwrap();
102+ mapping.insert("*.hook", MappingTarget::MapTo("INI")).unwrap();
111103
112104 mapping
113105 }
@@ -125,7 +117,7 @@ impl<'a> SyntaxMapping<'a> {
125117 &self.mappings
126118 }
127119
128− pub fn get_syntax_for(&self, path: impl AsRef<Path>) -> Option<MappingTarget<'a>> {
120+ pub(crate) fn get_syntax_for(&self, path: impl AsRef<Path>) -> Option<MappingTarget<'a>> {
129121 let candidate = Candidate::new(path.as_ref());
130122 let candidate_filename = path.as_ref().file_name().map(Candidate::new);
131123 for (ref glob, ref syntax) in self.mappings.iter().rev() {