Make sure we always load a syntax set

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

1 files changed, 20 insertions, 3 deletions

diff --git a/src/helpers/highlight.rs b/src/helpers/highlight.rs
index 56cc372..f6ca98f 100644
--- a/src/helpers/highlight.rs
+++ b/src/helpers/highlight.rs
@@ -16,10 +16,27 @@ use syntect::parsing::SyntaxSet;
 )]
 pub fn highlight(s: &str, theme: &Theme, ext: Option<&str>) -> Result<cached::Return<String>> {
     let syntax_set = SyntaxSet::load_defaults_newlines();
+
+    log::trace!("Finding syntax for {:?}", ext);
     let syntax = match ext {
-        Some(ext) => syntax_set.find_syntax_by_extension(ext).unwrap(),
-        None => syntax_set.find_syntax_by_first_line(s).unwrap(),
-    };
+        Some(ext) => {
+            log::trace!("Trying by extension ({:?})", ext);
+            syntax_set.find_syntax_by_extension(ext)
+                .or_else(|| {
+                    log::trace!("Trying by first line...");
+                    syntax_set.find_syntax_by_first_line(s)
+                })
+        },
+        None => {
+            log::trace!("Trying by first line...");
+            syntax_set.find_syntax_by_first_line(s)
+        },
+    }
+    .unwrap_or_else(|| {
+        log::trace!("Using plaintext");
+        syntax_set.find_syntax_plain_text()
+    });
+    log::trace!("Found syntax for {:?} = {:?}", ext, syntax);
 
     Ok(Return::new(highlighted_html_for_string(s, &syntax_set, &syntax, theme)))
 }