Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #5212

Browse source 
5212: Fix module renaming r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-07-03 16:55:01 +00:00 committed by GitHub
commit a434ecef51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 715 additions and 780 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

453
crates/ra_ide/src/references/rename.rs
View file

@ -116,8 +116,7 @@ fn rename_mod(
} else {
format!("{}.rs", new_name)
};
let move_file =
FileSystemEdit::MoveFile { src: file_id, anchor: position.file_id, dst };
let move_file = FileSystemEdit::MoveFile { src: file_id, anchor: file_id, dst };
file_system_edits.push(move_file);
}
ModuleSource::Module(..) => {}
@ -271,51 +270,51 @@ fn rename_reference(
#[cfg(test)]
mod tests {
use insta::assert_debug_snapshot;
use expect::{expect, Expect};
use ra_text_edit::TextEditBuilder;
use stdx::trim_indent;
use test_utils::{assert_eq_text, mark};
use crate::{mock_analysis::analysis_and_position, FileId};
fn check(new_name: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
let ra_fixture_after = &trim_indent(ra_fixture_after);
let (analysis, position) = analysis_and_position(ra_fixture_before);
let source_change = analysis.rename(position, new_name).unwrap();
let mut text_edit_builder = TextEditBuilder::default();
let mut file_id: Option<FileId> = None;
if let Some(change) = source_change {
for edit in change.info.source_file_edits {
file_id = Some(edit.file_id);
for indel in edit.edit.into_iter() {
text_edit_builder.replace(indel.delete, indel.insert);
}
}
}
let mut result = analysis.file_text(file_id.unwrap()).unwrap().to_string();
text_edit_builder.finish().apply(&mut result);
assert_eq_text!(ra_fixture_after, &*result);
}
fn check_expect(new_name: &str, ra_fixture: &str, expect: Expect) {
let (analysis, position) = analysis_and_position(ra_fixture);
let source_change = analysis.rename(position, new_name).unwrap().unwrap();
expect.assert_debug_eq(&source_change)
}
#[test]
fn test_rename_to_underscore() {
test_rename(
r#"
fn main() {
let i<|> = 1;
}"#,
"_",
r#"
fn main() {
let _ = 1;
}"#,
);
check("_", r#"fn main() { let i<|> = 1; }"#, r#"fn main() { let _ = 1; }"#);
}
#[test]
fn test_rename_to_raw_identifier() {
test_rename(
r#"
fn main() {
let i<|> = 1;
}"#,
"r#fn",
r#"
fn main() {
let r#fn = 1;
}"#,
);
check("r#fn", r#"fn main() { let i<|> = 1; }"#, r#"fn main() { let r#fn = 1; }"#);
}
#[test]
fn test_rename_to_invalid_identifier() {
let (analysis, position) = analysis_and_position(
"
fn main() {
let i<|> = 1;
}",
);
let (analysis, position) = analysis_and_position(r#"fn main() { let i<|> = 1; }"#);
let new_name = "invalid!";
let source_change = analysis.rename(position, new_name).unwrap();
assert!(source_change.is_none());
@ -323,163 +322,138 @@ mod tests {
#[test]
fn test_rename_for_local() {
test_rename(
check(
"k",
r#"
fn main() {
let mut i = 1;
let j = 1;
i = i<|> + j;
{
i = 0;
}
{ i = 0; }
i = 5;
}"#,
"k",
}
"#,
r#"
fn main() {
let mut k = 1;
let j = 1;
k = k + j;
{
k = 0;
}
{ k = 0; }
k = 5;
}"#,
}
"#,
);
}
#[test]
fn test_rename_for_macro_args() {
test_rename(
check(
"b",
r#"
macro_rules! foo {($i:ident) => {$i} }
fn main() {
let a<|> = "test";
foo!(a);
}"#,
"b",
}
"#,
r#"
macro_rules! foo {($i:ident) => {$i} }
fn main() {
let b = "test";
foo!(b);
}"#,
}
"#,
);
}
#[test]
fn test_rename_for_macro_args_rev() {
test_rename(
check(
"b",
r#"
macro_rules! foo {($i:ident) => {$i} }
fn main() {
let a = "test";
foo!(a<|>);
}"#,
"b",
}
"#,
r#"
macro_rules! foo {($i:ident) => {$i} }
fn main() {
let b = "test";
foo!(b);
}"#,
}
"#,
);
}
#[test]
fn test_rename_for_macro_define_fn() {
test_rename(
check(
"bar",
r#"
macro_rules! define_fn {($id:ident) => { fn $id{} }}
define_fn!(foo);
fn main() {
fo<|>o();
}"#,
"bar",
}
"#,
r#"
macro_rules! define_fn {($id:ident) => { fn $id{} }}
define_fn!(bar);
fn main() {
bar();
}"#,
}
"#,
);
}
#[test]
fn test_rename_for_macro_define_fn_rev() {
test_rename(
check(
"bar",
r#"
macro_rules! define_fn {($id:ident) => { fn $id{} }}
define_fn!(fo<|>o);
fn main() {
foo();
}"#,
"bar",
}
"#,
r#"
macro_rules! define_fn {($id:ident) => { fn $id{} }}
define_fn!(bar);
fn main() {
bar();
}"#,
}
"#,
);
}
#[test]
fn test_rename_for_param_inside() {
test_rename(
r#"
fn foo(i : u32) -> u32 {
i<|>
}"#,
"j",
r#"
fn foo(j : u32) -> u32 {
j
}"#,
);
check("j", r#"fn foo(i : u32) -> u32 { i<|> }"#, r#"fn foo(j : u32) -> u32 { j }"#);
}
#[test]
fn test_rename_refs_for_fn_param() {
test_rename(
r#"
fn foo(i<|> : u32) -> u32 {
i
}"#,
"new_name",
r#"
fn foo(new_name : u32) -> u32 {
new_name
}"#,
);
check("j", r#"fn foo(i<|> : u32) -> u32 { i }"#, r#"fn foo(j : u32) -> u32 { j }"#);
}
#[test]
fn test_rename_for_mut_param() {
test_rename(
r#"
fn foo(mut i<|> : u32) -> u32 {
i
}"#,
"new_name",
r#"
fn foo(mut new_name : u32) -> u32 {
new_name
}"#,
);
check("j", r#"fn foo(mut i<|> : u32) -> u32 { i }"#, r#"fn foo(mut j : u32) -> u32 { j }"#);
}
#[test]
fn test_rename_struct_field() {
test_rename(
check(
"j",
r#"
struct Foo {
i<|>: i32,
}
struct Foo { i<|>: i32 }
impl Foo {
fn new(i: i32) -> Self {
@ -487,11 +461,8 @@ mod tests {
}
}
"#,
"j",
r#"
struct Foo {
j: i32,
}
struct Foo { j: i32 }
impl Foo {
fn new(i: i32) -> Self {
@ -505,11 +476,10 @@ mod tests {
#[test]
fn test_rename_struct_field_for_shorthand() {
mark::check!(test_rename_struct_field_for_shorthand);
test_rename(
check(
"j",
r#"
struct Foo {
i<|>: i32,
}
struct Foo { i<|>: i32 }
impl Foo {
fn new(i: i32) -> Self {
@ -517,11 +487,8 @@ mod tests {
}
}
"#,
"j",
r#"
struct Foo {
j: i32,
}
struct Foo { j: i32 }
impl Foo {
fn new(i: i32) -> Self {
@ -535,11 +502,10 @@ mod tests {
#[test]
fn test_rename_local_for_field_shorthand() {
mark::check!(test_rename_local_for_field_shorthand);
test_rename(
check(
"j",
r#"
struct Foo {
i: i32,
}
struct Foo { i: i32 }
impl Foo {
fn new(i<|>: i32) -> Self {
@ -547,11 +513,8 @@ mod tests {
}
}
"#,
"j",
r#"
struct Foo {
i: i32,
}
struct Foo { i: i32 }
impl Foo {
fn new(j: i32) -> Self {
@ -564,15 +527,11 @@ mod tests {
#[test]
fn test_field_shorthand_correct_struct() {
test_rename(
check(
"j",
r#"
struct Foo {
i<|>: i32,
}
struct Bar {
i: i32,
}
struct Foo { i<|>: i32 }
struct Bar { i: i32 }
impl Bar {
fn new(i: i32) -> Self {
@ -580,15 +539,9 @@ mod tests {
}
}
"#,
"j",
r#"
struct Foo {
j: i32,
}
struct Bar {
i: i32,
}
struct Foo { j: i32 }
struct Bar { i: i32 }
impl Bar {
fn new(i: i32) -> Self {
@ -601,11 +554,10 @@ mod tests {
#[test]
fn test_shadow_local_for_struct_shorthand() {
test_rename(
check(
"j",
r#"
struct Foo {
i: i32,
}
struct Foo { i: i32 }
fn baz(i<|>: i32) -> Self {
let x = Foo { i };
@ -615,11 +567,8 @@ mod tests {
}
}
"#,
"j",
r#"
struct Foo {
i: i32,
}
struct Foo { i: i32 }
fn baz(j: i32) -> Self {
let x = Foo { i: j };
@ -634,7 +583,8 @@ mod tests {
#[test]
fn test_rename_mod() {
let (analysis, position) = analysis_and_position(
check_expect(
"foo2",
r#"
//- /lib.rs
mod bar;
@ -643,14 +593,9 @@ mod bar;
mod foo<|>;
//- /bar/foo.rs
// emtpy
// empty
"#,
);
let new_name = "foo2";
let source_change = analysis.rename(position, new_name).unwrap();
assert_debug_snapshot!(&source_change,
@r###"
Some(
expect![[r#"
RangeInfo {
range: 4..7,
info: SourceChange {
@ -675,21 +620,22 @@ mod foo<|>;
3,
),
anchor: FileId(
2,
3,
),
dst: "foo2.rs",
},
],
is_snippet: false,
},
},
)
"###);
}
"#]],
);
}
#[test]
fn test_rename_mod_in_use_tree() {
let (analysis, position) = analysis_and_position(
check_expect(
"quux",
r#"
//- /main.rs
pub mod foo;
@ -702,12 +648,7 @@ pub struct FooContent;
//- /bar.rs
use crate::foo<|>::FooContent;
"#,
);
let new_name = "qux";
let source_change = analysis.rename(position, new_name).unwrap();
assert_debug_snapshot!(&source_change,
@r###"
Some(
expect![[r#"
RangeInfo {
range: 11..14,
info: SourceChange {
@ -719,7 +660,7 @@ use crate::foo<|>::FooContent;
edit: TextEdit {
indels: [
Indel {
insert: "qux",
insert: "quux",
delete: 8..11,
},
],
@ -732,7 +673,7 @@ use crate::foo<|>::FooContent;
edit: TextEdit {
indels: [
Indel {
insert: "qux",
insert: "quux",
delete: 11..14,
},
],
@ -745,33 +686,29 @@ use crate::foo<|>::FooContent;
2,
),
anchor: FileId(
3,
2,
),
dst: "qux.rs",
dst: "quux.rs",
},
],
is_snippet: false,
},
},
)
"###);
}
"#]],
);
}
#[test]
fn test_rename_mod_in_dir() {
let (analysis, position) = analysis_and_position(
check_expect(
"foo2",
r#"
//- /lib.rs
mod fo<|>o;
//- /foo/mod.rs
// emtpy
"#,
);
let new_name = "foo2";
let source_change = analysis.rename(position, new_name).unwrap();
assert_debug_snapshot!(&source_change,
@r###"
Some(
expect![[r#"
RangeInfo {
range: 4..7,
info: SourceChange {
@ -796,45 +733,87 @@ mod fo<|>o;
2,
),
anchor: FileId(
1,
2,
),
dst: "../foo2/mod.rs",
},
],
is_snippet: false,
},
}
"#]],
);
}
#[test]
fn test_rename_unusually_nested_mod() {
check_expect(
"bar",
r#"
//- /lib.rs
mod outer { mod fo<|>o; }
//- /outer/foo.rs
// emtpy
"#,
expect![[r#"
RangeInfo {
range: 16..19,
info: SourceChange {
source_file_edits: [
SourceFileEdit {
file_id: FileId(
1,
),
edit: TextEdit {
indels: [
Indel {
insert: "bar",
delete: 16..19,
},
)
"###
],
},
},
],
file_system_edits: [
MoveFile {
src: FileId(
2,
),
anchor: FileId(
2,
),
dst: "bar.rs",
},
],
is_snippet: false,
},
}
"#]],
);
}
#[test]
fn test_module_rename_in_path() {
test_rename(
r#"
mod <|>foo {
pub fn bar() {}
}
fn main() {
foo::bar();
}"#,
check(
"baz",
r#"
mod baz {
pub fn bar() {}
}
mod <|>foo { pub fn bar() {} }
fn main() {
baz::bar();
}"#,
fn main() { foo::bar(); }
"#,
r#"
mod baz { pub fn bar() {} }
fn main() { baz::bar(); }
"#,
);
}
#[test]
fn test_rename_mod_filename_and_path() {
let (analysis, position) = analysis_and_position(
check_expect(
"foo2",
r#"
//- /lib.rs
mod bar;
@ -848,12 +827,7 @@ pub mod foo<|>;
//- /bar/foo.rs
// pub fn fun() {}
"#,
);
let new_name = "foo2";
let source_change = analysis.rename(position, new_name).unwrap();
assert_debug_snapshot!(&source_change,
@r###"
Some(
expect![[r#"
RangeInfo {
range: 8..11,
info: SourceChange {
@ -891,26 +865,25 @@ pub mod foo<|>;
3,
),
anchor: FileId(
2,
3,
),
dst: "foo2.rs",
},
],
is_snippet: false,
},
},
)
"###);
}
"#]],
);
}
#[test]
fn test_enum_variant_from_module_1() {
test_rename(
check(
"Baz",
r#"
mod foo {
pub enum Foo {
Bar<|>,
}
pub enum Foo { Bar<|> }
}
fn func(f: foo::Foo) {
@ -919,12 +892,9 @@ pub mod foo<|>;
}
}
"#,
"Baz",
r#"
mod foo {
pub enum Foo {
Baz,
}
pub enum Foo { Baz }
}
fn func(f: foo::Foo) {
@ -938,24 +908,20 @@ pub mod foo<|>;
#[test]
fn test_enum_variant_from_module_2() {
test_rename(
check(
"baz",
r#"
mod foo {
pub struct Foo {
pub bar<|>: uint,
}
pub struct Foo { pub bar<|>: uint }
}
fn foo(f: foo::Foo) {
let _ = f.bar;
}
"#,
"baz",
r#"
mod foo {
pub struct Foo {
pub baz: uint,
}
pub struct Foo { pub baz: uint }
}
fn foo(f: foo::Foo) {
@ -967,11 +933,10 @@ pub mod foo<|>;
#[test]
fn test_parameter_to_self() {
test_rename(
check(
"self",
r#"
struct Foo {
i: i32,
}
struct Foo { i: i32 }
impl Foo {
fn f(foo<|>: &mut Foo) -> i32 {
@ -979,11 +944,8 @@ pub mod foo<|>;
}
}
"#,
"self",
r#"
struct Foo {
i: i32,
}
struct Foo { i: i32 }
impl Foo {
fn f(&mut self) -> i32 {
@ -996,11 +958,10 @@ pub mod foo<|>;
#[test]
fn test_self_to_parameter() {
test_rename(
check(
"foo",
r#"
struct Foo {
i: i32,
}
struct Foo { i: i32 }
impl Foo {
fn f(&mut <|>self) -> i32 {
@ -1008,11 +969,8 @@ pub mod foo<|>;
}
}
"#,
"foo",
r#"
struct Foo {
i: i32,
}
struct Foo { i: i32 }
impl Foo {
fn f(foo: &mut Foo) -> i32 {
@ -1025,11 +983,10 @@ pub mod foo<|>;
#[test]
fn test_self_in_path_to_parameter() {
test_rename(
check(
"foo",
r#"
struct Foo {
i: i32,
}
struct Foo { i: i32 }
impl Foo {
fn f(&self) -> i32 {
@ -1038,11 +995,8 @@ pub mod foo<|>;
}
}
"#,
"foo",
r#"
struct Foo {
i: i32,
}
struct Foo { i: i32 }
impl Foo {
fn f(foo: &Foo) -> i32 {
@ -1053,23 +1007,4 @@ pub mod foo<|>;
"#,
);
}
fn test_rename(ra_fixture_before: &str, new_name: &str, ra_fixture_after: &str) {
let ra_fixture_after = &trim_indent(ra_fixture_after);
let (analysis, position) = analysis_and_position(ra_fixture_before);
let source_change = analysis.rename(position, new_name).unwrap();
let mut text_edit_builder = TextEditBuilder::default();
let mut file_id: Option<FileId> = None;
if let Some(change) = source_change {
for edit in change.info.source_file_edits {
file_id = Some(edit.file_id);
for indel in edit.edit.into_iter() {
text_edit_builder.replace(indel.delete, indel.insert);
}
}
}
let mut result = analysis.file_text(file_id.unwrap()).unwrap().to_string();
text_edit_builder.finish().apply(&mut result);
assert_eq_text!(ra_fixture_after, &*result);
}
}