Abort ignored filename suffix stripping early on unworkable filenames

sharkdp · Jul 9, 2021 · 21338ed · 21338ed
1 parent dc8ab0b
commit 21338ed
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/assets.rs b/src/assets.rs
@@ -291,10 +291,11 @@ impl HighlightingAssets {
                         .and_then(|x| x.to_str())
                         .unwrap_or_default(),
                 ).or_else(|| {
-                    let file_str = file_path.to_str().unwrap_or_default();
-                    for suffix in IGNORED_SUFFIXES.iter() {
-                        if let Some(stripped_filename) = file_str.strip_suffix(suffix) {
-                            return self.get_extension_syntax(OsStr::new(stripped_filename));
+                    if let Some(file_str) = file_path.to_str() {
+                        for suffix in IGNORED_SUFFIXES.iter() {
+                            if let Some(stripped_filename) = file_str.strip_suffix(suffix) {
+                                return self.get_extension_syntax(OsStr::new(stripped_filename));
+                            }
                         }
                     }
                     None