From ad98d35a48cb45948342a3e626dcefb91d9c47e4 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sat, 25 Sep 2021 09:47:31 +0200 Subject: [PATCH] HighlightingAssets: Implement get_syntax_for_file_name() with get_syntax_for_path() We can do this since the file_name() of a file_name is file_name. --- src/assets.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/assets.rs b/src/assets.rs index e1e5cec6..8eb1fe49 100644 --- a/src/assets.rs +++ b/src/assets.rs @@ -159,12 +159,7 @@ impl HighlightingAssets { file_name: impl AsRef, mapping: &SyntaxMapping, ) -> Result> { - let file_name = file_name.as_ref(); - Ok(match mapping.get_syntax_for(file_name) { - Some(MappingTarget::MapToUnknown) => None, - Some(MappingTarget::MapTo(syntax_name)) => self.find_syntax_by_name(syntax_name)?, - None => self.get_extension_syntax(file_name.as_os_str())?, - }) + Ok(self.get_syntax_for_path(file_name.as_ref(), mapping).ok()) } fn get_syntax_for_path(