chore: fix document root calculation

biomejs · Mar 30, 2024 · c15869d · c15869d
1 parent 8a2e6e7
commit c15869d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 40 deletions.
diff --git a/crates/biome_js_analyze/tests/specs/correctness/noUnreachable/SuppressionComments.js.snap b/crates/biome_js_analyze/tests/specs/correctness/noUnreachable/SuppressionComments.js.snap
@@ -33,22 +33,10 @@ SuppressionComments.js:1:1 suppressions/deprecatedSuppressionComment FIXABLE
  
  i Unsafe fix: Use // biome-ignore instead
  
- 1 │ - //·rome-ignore·lint/correctness/noUnreachable:·this·comment·does·nothing
- 1 │ + //·biome-ignore·lint/correctness/noUnreachable:·this·comment·does·nothing
- 2 2 │ function SuppressionComments1() {
- 3 3 │ beforeReturn();
- 4 4 │ return;
- 5 5 │ afterReturn();
- 6 │ - }
- 6 │ + }
- 7 │ + 
- 8 │ + function·SuppressionComments2()·{
- 9 │ + ····beforeReturn();
- 10 │ + ····return;
- 11 │ + ····//·rome-ignore·lint/correctness/noUnreachable:·supress·warning
- 12 │ + ····afterReturn();
- 13 │ + }
- 14 │ + 
+ 1 │ - //·rome-ignore·lint/correctness/noUnreachable:·this·comment·does·nothing
+ 1 │ + //·biome-ignore·lint/correctness/noUnreachable:·this·comment·does·nothing
+ 2 2 │ function SuppressionComments1() {
+ 3 3 │ beforeReturn();
  
 
 ```
@@ -91,23 +79,12 @@ SuppressionComments.js:11:5 suppressions/deprecatedSuppressionComment FIXABLE
  
  i Unsafe fix: Use // biome-ignore instead
  
- 1 │ - 
- 2 │ - ····//·rome-ignore·lint/correctness/noUnreachable:·supress·warning
- 3 │ - ····afterReturn
- 1 │ + //·rome-ignore·lint/correctness/noUnreachable:·this·comment·does·nothing
- 2 │ + function·SuppressionComments1()·{
- 3 │ + ····beforeReturn();
- 4 │ + ····return;
- 5 │ + ····afterReturn();
- 6 │ + }
- 7 │ + 
- 8 │ + function·SuppressionComments2()·{
- 9 │ + ····beforeReturn();
- 10 │ + ····return;
- 11 │ + ····//·biome-ignore·lint/correctness/noUnreachable:·supress·warning
- 12 │ + ····afterReturn();
- 13 │ + }
- 14 │ + 
+ 9 9 │ beforeReturn();
+ 10 10 │ return;
+ 11 │ - ····//·rome-ignore·lint/correctness/noUnreachable:·supress·warning
+ 11 │ + ····//·biome-ignore·lint/correctness/noUnreachable:·supress·warning
+ 12 12 │ afterReturn();
+ 13 13 │ }
  
 
 ```
@@ -124,5 +101,3 @@ SuppressionComments.js:1:1 suppressions/unused ━━━━━━━━━━━
  
 
 ```
-
-
diff --git a/crates/biome_rowan/src/ast/batch.rs b/crates/biome_rowan/src/ast/batch.rs
@@ -335,7 +335,14 @@ where
  // Convert mutations to text edit
  let mut text_range = TextRange::default();
  let mut text_edit_builder = TextEditBuilder::default();
- let root_text = self.root().to_string();
+
+ // Mutation root is not necessarily the document root in some rule actions.
+ let mut document_root = self.root().clone();
+ while let Some(parent) = document_root.parent() {
+ document_root = parent;
+ }
+
+ let document_root_text = document_root.to_string();
 
  let mut pointer: usize = 0;
 
@@ -346,10 +353,10 @@ where
  ) {
  text_range = text_range.cover(old_text_range);
  if range_start > pointer {
- text_edit_builder.equal(&root_text[pointer..range_start]);
+ text_edit_builder.equal(&document_root_text[pointer..range_start]);
  }
 
- let old = &root_text[range_start..range_end];
+ let old = &document_root_text[range_start..range_end];
  let new = &optional_new_text.map_or(String::new(), |t| t);
 
  text_edit_builder.with_unicode_words_diff(old, new);
@@ -358,9 +365,9 @@ where
  }
  }
 
- let end_pos = root_text.len();
+ let end_pos = document_root_text.len();
  if end_pos > pointer {
- text_edit_builder.equal(&root_text[pointer..end_pos]);
+ text_edit_builder.equal(&document_root_text[pointer..end_pos]);
  }
 
  let text_edit = text_edit_builder.finish();