Find syntax ignoring known backup/template filename suffixes

src/assets.rs

@@ -23,6 +23,17 @@ pub struct HighlightingAssets {
     fallback_theme: Option<&'static str>,
 }
 
+const IGNORED_SUFFIXES: [&str; 10] = [
+    // Editor etc backups
+    "~", ".bak", ".old", ".orig",
+    // Debian and derivatives apt/dpkg backups
+    ".dpkg-dist", ".dpkg-old",
+    // Red Hat and derivatives rpm backups
+    ".rpmnew", ".rpmorig", ".rpmsave",
+    // Build system input/template files
+    ".in",
+];
+
 impl HighlightingAssets {
     pub fn default_theme() -> &'static str {
         "Monokai Extended"
@@ -273,12 +284,22 @@ impl HighlightingAssets {
         self.syntax_set
             .find_syntax_by_extension(file_name.to_str().unwrap_or_default())
             .or_else(|| {
+                let file_path = Path::new(file_name);
                 self.syntax_set.find_syntax_by_extension(
-                    Path::new(file_name)
+                    file_path
                         .extension()
                         .and_then(|x| x.to_str())
                         .unwrap_or_default(),
-                )
+                ).or_else(|| {
+                    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
+                })
             })
     }
 

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.bak

@@ -0,0 +1 @@
+// foo.bak (editor etc backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.dpkg-dist

@@ -0,0 +1 @@
+// foo.dpkg-dist (Debian dpkg backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.dpkg-old

@@ -0,0 +1 @@
+// foo.dpkg-old (Debian dpkg backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.in

@@ -0,0 +1 @@
+// foo.in (build system input) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.in.in

@@ -0,0 +1 @@
+// foo.in.in (build system input, doubly replaced) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.old

@@ -0,0 +1 @@
+// foo.old (editor etc backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.orig

@@ -0,0 +1 @@
+// foo.orig (editor, diff etc backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.orig~

@@ -0,0 +1 @@
+// foo.orig~ (backup of an editor, diff etc backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.rpmnew

@@ -0,0 +1 @@
+// foo.rpmnew (Red Hat rpm backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.rpmorig

@@ -0,0 +1 @@
+// foo.rpmorig (Red Hat rpm backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.rpmsave

@@ -0,0 +1 @@
+// foo.rpmsave (Red Hat rpm backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs~

@@ -0,0 +1 @@
+// foo~ (editor backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.unknown~

@@ -0,0 +1 @@
+// foo~ for unknown foo should not highlight

tests/syntax-tests/source/Ignored suffixes/test.rs.bak

@@ -0,0 +1 @@
+// foo.bak (editor etc backup) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.rs.dpkg-dist

@@ -0,0 +1 @@
+// foo.dpkg-dist (Debian dpkg backup) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.rs.dpkg-old

@@ -0,0 +1 @@
+// foo.dpkg-old (Debian dpkg backup) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.rs.in

@@ -0,0 +1 @@
+// foo.in (build system input) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.rs.in.in

@@ -0,0 +1 @@
+// foo.in.in (build system input, doubly replaced) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.rs.old

@@ -0,0 +1 @@
+// foo.old (editor etc backup) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.rs.orig

@@ -0,0 +1 @@
+// foo.orig (editor, diff etc backup) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.rs.orig~

@@ -0,0 +1 @@
+// foo.orig~ (backup of an editor, diff etc backup) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.rs.rpmnew

@@ -0,0 +1 @@
+// foo.rpmnew (Red Hat rpm backup) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.rs.rpmorig

@@ -0,0 +1 @@
+// foo.rpmorig (Red Hat rpm backup) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.rs.rpmsave

@@ -0,0 +1 @@
+// foo.rpmsave (Red Hat rpm backup) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.rs~

@@ -0,0 +1 @@
+// foo~ (editor backup) should highlight same as foo

tests/syntax-tests/source/Ignored suffixes/test.unknown~

@@ -0,0 +1 @@
+// foo~ for unknown foo should not highlight