2d5ff9e · helix · git.iko.soy

on master help sign in

fix crash when encountering overlapping injections

2d5ff9ePascal Kuthe3 years ago

helix-core/src/syntax.rs+5

@@ -1136,6 +1136,7 @@ impl Syntax {

1136 RopeProvider(source_slice),

1137 );

1138 let mut injections = Vec::new();

1139+ let mut last_injection_end = 0;

1139 for mat in matches {

1140 for mat in matches {

1140 let (injection_capture, content_node, included_children) = layer

1141 let (injection_capture, content_node, included_children) = layer

1141 .config

1142 .config

@@ -1155,6 +1156,10 @@ impl Syntax {

1155 intersect_ranges(&layer.ranges, &[content_node], included_children);

1156 intersect_ranges(&layer.ranges, &[content_node], included_children);

1156

1157

1157 if !ranges.is_empty() {

1158 if !ranges.is_empty() {

1159+ if content_node.start_byte() < last_injection_end {

1160+ continue;

1161+ }

1162+ last_injection_end = content_node.end_byte();

1158 injections.push((config, ranges));

1163 injections.push((config, ranges));

1159 }

1164 }

1160 }

1165 }