@@ -9,7 +9,7 @@ use syntect::parsing::{SyntaxReference, SyntaxSet, SyntaxSetBuilder};
99
1010use crate::errors::*;
1111use crate::inputfile::{InputFile, InputFileReader};
12−use crate::syntax_mapping::SyntaxMapping;
12+use crate::syntax_mapping::{MappingTarget, SyntaxMapping};
1313
1414#[derive(Debug)]
1515pub struct HighlightingAssets {
@@ -184,25 +184,28 @@ impl HighlightingAssets {
184184 (Some(language), _) => self.syntax_set.find_syntax_by_token(language),
185185 (None, InputFile::Ordinary(filename)) => {
186186 let path = Path::new(filename);
187+
187188 let file_name = path.file_name().and_then(|n| n.to_str()).unwrap_or("");
188189 let extension = path.extension().and_then(|x| x.to_str()).unwrap_or("");
189190
190− let file_name = mapping.replace(file_name);
191− let extension = mapping.replace(extension);
192−
193191 let ext_syntax = self
194192 .syntax_set
195193 .find_syntax_by_extension(&file_name)
196194 .or_else(|| self.syntax_set.find_syntax_by_extension(&extension));
197− let line_syntax = if ext_syntax.is_none() {
198− String::from_utf8(reader.first_line.clone())
199− .ok()
200− .and_then(|l| self.syntax_set.find_syntax_by_first_line(&l))
201− } else {
202− None
203− };
204−
205− ext_syntax.or(line_syntax)
195+ let line_syntax = String::from_utf8(reader.first_line.clone())
196+ .ok()
197+ .and_then(|l| self.syntax_set.find_syntax_by_first_line(&l));
198+
199+ dbg!(path);
200+ match dbg!(mapping.get_syntax_for(path)) {
201+ Some(MappingTarget::MapTo(syntax_name)) => {
202+ // TODO: we should probably return an error here if this syntax can not be
203+ // found. Currently, we just fall back to 'plain'.
204+ self.syntax_set.find_syntax_by_name(syntax_name)
205+ }
206+ Some(MappingTarget::MapToUnknown) => line_syntax,
207+ None => ext_syntax.or(line_syntax),
208+ }
206209 }
207210 (None, InputFile::StdIn) => String::from_utf8(reader.first_line.clone())
208211 .ok()
@@ -225,19 +228,19 @@ mod tests {
225228
226229 use crate::assets::HighlightingAssets;
227230 use crate::inputfile::InputFile;
228− use crate::syntax_mapping::SyntaxMapping;
231+ use crate::syntax_mapping::{MappingTarget, SyntaxMapping};
229232
230− struct SyntaxDetectionTest {
233+ struct SyntaxDetectionTest<'a> {
231234 assets: HighlightingAssets,
232− pub syntax_mapping: SyntaxMapping,
235+ pub syntax_mapping: SyntaxMapping<'a>,
233236 temp_dir: TempDir,
234237 }
235238
236− impl SyntaxDetectionTest {
239+ impl<'a> SyntaxDetectionTest<'a> {
237240 fn new() -> Self {
238241 SyntaxDetectionTest {
239242 assets: HighlightingAssets::from_binary(),
240− syntax_mapping: SyntaxMapping::new(),
243+ syntax_mapping: SyntaxMapping::builtin(),
241244 temp_dir: TempDir::new("bat_syntax_detection_tests")
242245 .expect("creation of temporary directory"),
243246 }
@@ -294,6 +297,10 @@ mod tests {
294297 test.syntax_name_with_content("my_script", "#!/bin/bash"),
295298 "Bourne Again Shell (bash)"
296299 );
300+ assert_eq!(
301+ test.syntax_name_with_content("build", "#!/bin/bash"),
302+ "Bourne Again Shell (bash)"
303+ );
297304 assert_eq!(test.syntax_name_with_content("my_script", "<?php"), "PHP");
298305 }
299306
@@ -302,7 +309,20 @@ mod tests {
302309 let mut test = SyntaxDetectionTest::new();
303310
304311 assert_ne!(test.syntax_name("test.h"), "C++");
305− test.syntax_mapping.insert("h", "cpp");
312+ test.syntax_mapping
313+ .insert("*.h", MappingTarget::MapTo("C++"))
314+ .ok();
306315 assert_eq!(test.syntax_name("test.h"), "C++");
307316 }
317+
318+ #[test]
319+ fn syntax_detection_is_case_sensitive() {
320+ let mut test = SyntaxDetectionTest::new();
321+
322+ assert_ne!(test.syntax_name("README.MD"), "Markdown");
323+ test.syntax_mapping
324+ .insert("*.MD", MappingTarget::MapTo("Markdown"))
325+ .ok();
326+ assert_eq!(test.syntax_name("README.MD"), "Markdown");
327+ }
308328}