zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2234 from zed-industries/error-on-combined-injections-in-injections

Browse Source 
Fix range relativization when combined injections occur inside of other injections
This commit is contained in:
Max Brunsfeld 2023-03-03 11:58:13 -08:00 committed by GitHub
commit 124aa74b03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
crates/language/src/syntax_map.rs
View File

@ -165,6 +165,7 @@ struct ParseStep {
mode: ParseMode,
}
#[derive(Debug)]
enum ParseStepLanguage {
Loaded { language: Arc<Language> },
Pending { name: Arc<str> },
@ -514,15 +515,32 @@ impl SyntaxSnapshot {
let Some(grammar) = language.grammar() else { continue };
let tree;
let changed_ranges;
let mut included_ranges = step.included_ranges;
for range in &mut included_ranges {
range.start_byte -= step_start_byte;
range.end_byte -= step_start_byte;
range.start_point = (Point::from_ts_point(range.start_point)
- step_start_point)
.to_ts_point();
range.end_point = (Point::from_ts_point(range.end_point)
- step_start_point)
.to_ts_point();
}
if let Some(SyntaxLayerContent::Parsed { tree: old_tree, .. }) =
old_layer.map(|layer| &layer.content)
{
if let ParseMode::Combined {
parent_layer_changed_ranges,
mut parent_layer_changed_ranges,
..
} = step.mode
{
for range in &mut parent_layer_changed_ranges {
range.start -= step_start_byte;
range.end -= step_start_byte;
}
included_ranges = splice_included_ranges(
old_tree.included_ranges(),
&parent_layer_changed_ranges,
@ -534,7 +552,6 @@ impl SyntaxSnapshot {
grammar,
text.as_rope(),
step_start_byte,
step_start_point,
included_ranges,
Some(old_tree.clone()),
);
@ -551,7 +568,6 @@ impl SyntaxSnapshot {
grammar,
text.as_rope(),
step_start_byte,
step_start_point,
included_ranges,
None,
);
@ -1060,17 +1076,9 @@ fn parse_text(
grammar: &Grammar,
text: &Rope,
start_byte: usize,
start_point: Point,
mut ranges: Vec<tree_sitter::Range>,
ranges: Vec<tree_sitter::Range>,
old_tree: Option<Tree>,
) -> Tree {
for range in &mut ranges {
range.start_byte -= start_byte;
range.end_byte -= start_byte;
range.start_point = (Point::from_ts_point(range.start_point) - start_point).to_ts_point();
range.end_point = (Point::from_ts_point(range.end_point) - start_point).to_ts_point();
}
PARSER.with(|parser| {
let mut parser = parser.borrow_mut();
let mut chunks = text.chunks_in_range(start_byte..text.len());
@ -2208,6 +2216,37 @@ mod tests {
);
}
#[gpui::test]
fn test_combined_injections_inside_injections() {
let (_buffer, _syntax_map) = test_edit_sequence(
"Markdown",
&[
r#"
here is some ERB code:
```erb
<ul>
<% people.each do |person| %>
<li><%= person.name %></li>
<% end %>
</ul>
```
"#,
r#"
here is some ERB code:
```erb
<ul>
<% people«2».each do |person| %>
<li><%= person.name %></li>
<% end %>
</ul>
```
"#,
],
);
}
#[gpui::test(iterations = 50)]
fn test_random_syntax_map_edits(mut rng: StdRng) {
let operations = env::var("OPERATIONS")