about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-12-13 21:30:18 +0000
committerbors <bors@rust-lang.org>2023-12-13 21:30:18 +0000
commitdd07f1f2fbfd7e6ea581240af07131a1b7368b0f (patch)
tree2e0f6c086414dd8ac50ec8fc95d610d6402a3ee7
parentf81bd0cc715bf520da2f6c4a466bfbe6a770a854 (diff)
parent0beba7cfc4df26c49f875fdbc8f46e35e395227f (diff)
downloadrust-dd07f1f2fbfd7e6ea581240af07131a1b7368b0f.tar.gz
rust-dd07f1f2fbfd7e6ea581240af07131a1b7368b0f.zip
Auto merge of #15887 - jinohkang-theori:fix/ide-assists/convert_tuple_struct_to_named_struct/handle_refs_inside_macro_invocations, r=Veykril
Fix incorrectly replacing references in macro invocation in "Convert to named struct" assist

Fixes #15630.

Complements #13647 (same assist but missed this one), #14920 (inverse action assist).
-rw-r--r--crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs b/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs
index 017853a4a20..435d7c4a537 100644
--- a/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs
+++ b/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs
@@ -216,7 +216,7 @@ fn edit_field_references(
             edit.edit_file(file_id);
             for r in refs {
                 if let Some(name_ref) = r.name.as_name_ref() {
-                    edit.replace(name_ref.syntax().text_range(), name.text());
+                    edit.replace(ctx.sema.original_range(name_ref.syntax()).range, name.text());
                 }
             }
         }