From 355e62efe9321b4e64520230fe792dc0f80a6041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 13 Jun 2021 23:36:38 +0300
Subject: [PATCH] Find syntax ignoring known backup/template filename suffixes

For example, fall back to `foo.extension` for `foo.extension~`,
`foo.extension.orig`, `foo.extension.in.in` etc.
---
 src/assets.rs | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/assets.rs b/src/assets.rs
index 88509788..b09ced21 100644
--- a/src/assets.rs
+++ b/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,26 @@ 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(|| {
+                    let file_str = file_path.to_str().unwrap_or_default();
+                    for suffix in IGNORED_SUFFIXES.iter() {
+                        if file_str.ends_with(suffix) {
+                            return self.get_extension_syntax(
+                                OsStr::new(
+                                    file_str
+                                        .strip_suffix(suffix)
+                                        .unwrap_or_default()
+                                ));
+                        }
+                    }
+                    None
+                })
             })
     }