fix crash when encountering overlapping injections

helix-editor · Jul 13, 2023 · 0957a54 · 0957a54
1 parent e86bb64
commit 0957a54
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
@@ -1136,6 +1136,7 @@ impl Syntax {
                     RopeProvider(source_slice),
                 );
                 let mut injections = Vec::new();
+                let mut last_injection_end = 0;
                 for mat in matches {
                     let (injection_capture, content_node, included_children) = layer
                         .config
@@ -1150,6 +1151,11 @@ impl Syntax {
                     if let (Some(injection_capture), Some(content_node)) =
                         (injection_capture, content_node)
                     {
+                        if content_node.start_byte() < last_injection_end {
+                            continue;
+                        }
+                        last_injection_end = content_node.end_byte();
+
                         if let Some(config) = (injection_callback)(&injection_capture) {
                             let ranges =
                                 intersect_ranges(&layer.ranges, &[content_node], included_children);