From 2d5ff9ec8ff3d054973cc9198312e577863e693f Mon Sep 17 00:00:00 2001
From: Pascal Kuthe
Date: Thu, 13 Jul 2023 23:36:47 +0200
Subject: fix crash when encountering overlapping injections

---
 helix-core/src/syntax.rs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'helix-core')

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index f43b03ad..55062152 100644
--- 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
@@ -1155,6 +1156,10 @@ impl Syntax {
                                 intersect_ranges(&layer.ranges, &[content_node], included_children);
 
                             if !ranges.is_empty() {
+                                if content_node.start_byte() < last_injection_end {
+                                    continue;
+                                }
+                                last_injection_end = content_node.end_byte();
                                 injections.push((config, ranges));
                             }
                         }
-- 
cgit v1.2.3-70-g09d2