From c5be0b2589e5ed732ae5001122e453f0903bfdf2 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Tue, 9 Feb 2021 16:03:39 +0100 Subject: Use NameLike in FileReference directly as its not exported from ide anymore --- crates/ide/src/references/rename.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'crates/ide/src/references') diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs index 64992c72d..b04214291 100644 --- a/crates/ide/src/references/rename.rs +++ b/crates/ide/src/references/rename.rs @@ -164,20 +164,18 @@ fn find_definition( } fn source_edit_from_references( - sema: &Semantics, + _sema: &Semantics, file_id: FileId, references: &[FileReference], def: Definition, new_name: &str, ) -> (FileId, TextEdit) { - let root = sema.parse(file_id); let mut edit = TextEdit::builder(); for reference in references { - let (range, replacement) = match &reference.name_from_syntax(root.syntax()) { - Some(NameLike::Name(_)) => (None, format!("{}", new_name)), - Some(NameLike::NameRef(name_ref)) => source_edit_from_name_ref(name_ref, new_name, def), - Some(NameLike::Lifetime(_)) => (None, format!("{}", new_name)), - None => (None, new_name.to_owned()), + let (range, replacement) = match &reference.name { + NameLike::Name(_) => (None, format!("{}", new_name)), + NameLike::NameRef(name_ref) => source_edit_from_name_ref(name_ref, new_name, def), + NameLike::Lifetime(_) => (None, format!("{}", new_name)), }; // FIXME: Some(range) will be incorrect when we are inside macros edit.replace(range.unwrap_or(reference.range), replacement); -- cgit v1.2.3