Merge pull request #243 from helmet91/bump-dependency-versions

Bump versions of some dependencies

Author: kivikakk

Cargo.lock

@@ -22,12 +22,12 @@ required-features = ["clap", "syntect"]
 doc = false
 
 [dependencies]
-typed-arena = "1.4.1"
+typed-arena = "2.0.1"
 regex = "1.5.5"
 once_cell = "1.13.0"
 entities = "1.0.1"
 unicode_categories = "0.1.1"
-clap = { version = "2.32.0", optional = true, features = ["wrap_help"] }
+clap = { version = "2.34.0", optional = true, features = ["wrap_help"] }
 memchr = "2"
 pest = "2"
 pest_derive = "2"
@@ -46,7 +46,7 @@ default = ["clap", "syntect"]
 xdg = "^2.1"
 
 [target.'cfg(target_arch="wasm32")'.dependencies]
-syntect = { version = "4.6", optional = true, default-features = false, features = ["default-fancy"] }
+syntect = { version = "5.0", optional = true, default-features = false, features = ["default-fancy"] }
 
 [target.'cfg(not(target_arch="wasm32"))'.dependencies]
-syntect = { version = "4.6", optional = true, default-features = false, features = ["assets", "dump-load", "html", "regex-onig"] }
+syntect = { version = "5.0", optional = true, default-features = false, features = ["default-themes", "default-syntaxes", "html", "regex-onig"] }

Cargo.toml

@@ -28,12 +28,15 @@ impl<'a> SyntectAdapter<'a> {
 
     fn gen_empty_block(&self) -> String {
         let syntax = self.syntax_set.find_syntax_by_name("Plain Text").unwrap();
-        highlighted_html_for_string(
+        match highlighted_html_for_string(
             "",
             &self.syntax_set,
             syntax,
             &self.theme_set.themes[self.theme],
-        )
+        ) {
+            Ok(empty_block) => empty_block,
+            Err(_) => "".into(),
+        }
     }
 
     fn remove_pre_tag(&self, highlighted_code: String) -> String {
@@ -69,12 +72,15 @@ impl SyntaxHighlighterAdapter for SyntectAdapter<'_> {
                     .unwrap_or_else(|| self.syntax_set.find_syntax_plain_text())
             });
 
-        self.remove_pre_tag(highlighted_html_for_string(
+        match highlighted_html_for_string(
             code,
             &self.syntax_set,
             syntax,
             &self.theme_set.themes[self.theme],
-        ))
+        ) {
+            Ok(highlighted_code) => self.remove_pre_tag(highlighted_code),
+            Err(_) => code.into(),
+        }
     }
 
     fn build_pre_tag(&self, attributes: &HashMap<String, String>) -> String {