From add80bccfc564e840b739bb8162d48faabb00db1 Mon Sep 17 00:00:00 2001 From: TheDoctor314 <64731940+TheDoctor314@users.noreply.github.com> Date: Tue, 8 Feb 2022 21:19:14 +0530 Subject: [PATCH 1/2] Add test The rename function should not change any path segments that refer to a module by super. --- crates/ide/src/rename.rs | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs index f9f9c0832cd..971bcede5ac 100644 --- a/crates/ide/src/rename.rs +++ b/crates/ide/src/rename.rs @@ -1108,6 +1108,31 @@ pub mod foo$0; ); } + #[test] + fn test_rename_mod_ref_by_super() { + check( + "baz", + r#" + mod $0foo { + struct X; + + mod bar { + use super::X; + } + } + "#, + r#" + mod baz { + struct X; + + mod bar { + use super::X; + } + } + "#, + ) + } + #[test] fn test_enum_variant_from_module_1() { cov_mark::check!(rename_non_local); From 10e7e18dc6401dd57b13479c75362c681ee078ca Mon Sep 17 00:00:00 2001 From: TheDoctor314 <64731940+TheDoctor314@users.noreply.github.com> Date: Tue, 8 Feb 2022 21:28:32 +0530 Subject: [PATCH 2/2] Fix renaming super keyword --- crates/ide_db/src/rename.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs index 188499db72c..4392ae3e5ab 100644 --- a/crates/ide_db/src/rename.rs +++ b/crates/ide_db/src/rename.rs @@ -343,6 +343,10 @@ fn source_edit_from_name_ref( new_name: &str, def: Definition, ) -> bool { + if name_ref.super_token().is_some() { + return true; + } + if let Some(record_field) = ast::RecordExprField::for_name_ref(name_ref) { let rcf_name_ref = record_field.name_ref(); let rcf_expr = record_field.expr();