upgrade syntact to get rid of plist and #1275

extrawurst · extrawurst · commit 3ce715178bb0 · 2022-08-15T12:50:10.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,7 +44,7 @@ scopeguard = "1.1"
 scopetime = { path = "./scopetime", version = "0.1" }
 serde = "1.0"
 simplelog = { version = "0.11", default-features = false }
-syntect = { version = "4.6", default-features = false, features = ["metadata", "default-fancy"] }
+syntect = { version = "5.0", default-features = false, features = ["parsing", "default-syntaxes", "default-themes", "html", "regex-fancy"] }
 textwrap = "0.14"
 tui = { version = "0.16", default-features = false, features = ['crossterm', 'serde'] }
 unicode-segmentation = "1.9"
diff --git a/src/ui/syntax_text.rs b/src/ui/syntax_text.rs
@@ -118,7 +118,14 @@ impl SyntaxText {
 			))?;
 
 			for (number, line) in text.lines().enumerate() {
-				let ops = state.parse_line(line, &SYNTAX_SET);
+				let ops = state
+					.parse_line(line, &SYNTAX_SET)
+					.map_err(|e| {
+						log::error!("syntax error: {:?}", e);
+						asyncgit::Error::Generic(
+							"syntax error".to_string(),
+						)
+					})?;
 				let iter = RangedHighlightIterator::new(
 					&mut highlight_state,
 					&ops[..],
