ad98d35 · bat · git.iko.soy

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.

commitad98d35a48cb45948342a3e626dcefb91d9c47e4 authorMartin Nordholts <enselic@gmail.com> dateSat 25 Sep 2021, 09:47 (5 years ago) parentb69ab21

1 file changed+1−6

unifiedsplit

src/assets.rs+1−6

@@ -159,12 +159,7 @@ impl HighlightingAssets {

159159 file_name: impl AsRef<Path>,

160160 mapping: &SyntaxMapping,

161161 ) -> Result<Option<SyntaxReferenceInSet>> {

162− let file_name = file_name.as_ref();

163− Ok(match mapping.get_syntax_for(file_name) {

164− Some(MappingTarget::MapToUnknown) => None,

165− Some(MappingTarget::MapTo(syntax_name)) => self.find_syntax_by_name(syntax_name)?,

166− None => self.get_extension_syntax(file_name.as_os_str())?,

167− })

162+ Ok(self.get_syntax_for_path(file_name.as_ref(), mapping).ok())

168163 }

169164

170165 fn get_syntax_for_path(