kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix crash when encountering overlapping injections

Browse source
This commit is contained in:
Pascal Kuthe 2023-07-13 23:36:47 +02:00 • committed by Blaž Hrastnik
parent 79a8fd6249
commit 2d5ff9ec8f
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
helix-core/src/syntax.rs
View file

@ -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));
}
}