@@ -258,9 +258,14 @@ impl HighlightingAssets {
258258 }
259259
260260 fn get_extension_syntax(&self, file_name: &OsStr) -> Result<Option<SyntaxReferenceInSet>> {
261− let mut syntax = self.find_syntax_by_file_name(file_name)?;
261+ let mut syntax = self.find_syntax_by_extension(file_name.to_str().unwrap_or_default())?;
262262 if syntax.is_none() {
263− syntax = self.find_syntax_by_file_name_extension(file_name)?;
263+ syntax = self.find_syntax_by_extension(
264+ Path::new(file_name)
265+ .extension()
266+ .and_then(|x| x.to_str())
267+ .unwrap_or_default(),
268+ )?;
264269 }
265270 if syntax.is_none() {
266271 syntax = try_with_stripped_suffix(file_name, |stripped_file_name| {
@@ -270,22 +275,6 @@ impl HighlightingAssets {
270275 Ok(syntax)
271276 }
272277
273− fn find_syntax_by_file_name(&self, file_name: &OsStr) -> Result<Option<SyntaxReferenceInSet>> {
274− self.find_syntax_by_extension(file_name.to_str().unwrap_or_default())
275− }
276−
277− fn find_syntax_by_file_name_extension(
278− &self,
279− file_name: &OsStr,
280− ) -> Result<Option<SyntaxReferenceInSet>> {
281− self.find_syntax_by_extension(
282− Path::new(file_name)
283− .extension()
284− .and_then(|x| x.to_str())
285− .unwrap_or_default(),
286− )
287− }
288−
289278 fn get_first_line_syntax(
290279 &self,
291280 reader: &mut InputReader,