syntax: Split parsing and highlighting

ZoomRmc · Jan 23, 2022 · 6728e44 · 6728e44
1 parent 83bde10
commit 6728e44
Show file tree

Hide file tree

Showing 9 changed files with 541 additions and 662 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
@@ -22,6 +22,7 @@ unicode-segmentation = "1.8"
 unicode-width = "0.1"
 unicode-general-category = "0.4"
 # slab = "0.4.2"
+slotmap = "1.0"
 tree-sitter = "0.20"
 once_cell = "1.9"
 arc-swap = "1"

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
@@ -454,7 +454,7 @@ where
 
         let language_config = loader.language_config_for_scope("source.rust").unwrap();
         let highlight_config = language_config.highlight_config(&[]).unwrap();
-        let syntax = Syntax::new(&doc, highlight_config.clone());
+        let syntax = Syntax::new(&doc, highlight_config.clone(), std::sync::Arc::new(loader));
         let text = doc.slice(..);
         let tab_width = 4;