1 files changed, 54 insertions, 63 deletions

diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs
index 546224b50..99c2581b7 100644
--- a/crates/ra_ide/src/references/rename.rs
+++ b/crates/ra_ide/src/references/rename.rs
@@ -1,7 +1,7 @@
 //! FIXME: write short doc here
 
 use hir::{Module, ModuleDef, ModuleSource, Semantics};
-use ra_db::{RelativePath, RelativePathBuf, SourceDatabaseExt};
+use ra_db::{RelativePathBuf, SourceDatabaseExt};
 use ra_ide_db::{
     defs::{classify_name, classify_name_ref, Definition, NameClass, NameRefClass},
     RootDatabase,
@@ -111,23 +111,14 @@ fn rename_mod(
         ModuleSource::SourceFile(..) => {
             let mod_path: RelativePathBuf = db.file_relative_path(file_id);
             // mod is defined in path/to/dir/mod.rs
-            let dst_path = if mod_path.file_stem() == Some("mod") {
-                mod_path
-                    .parent()
-                    .and_then(|p| p.parent())
-                    .or_else(|| Some(RelativePath::new("")))
-                    .map(|p| p.join(new_name).join("mod.rs"))
+            let dst = if mod_path.file_stem() == Some("mod") {
+                format!("../{}/mod.rs", new_name)
             } else {
-                Some(mod_path.with_file_name(new_name).with_extension("rs"))
+                format!("{}.rs", new_name)
             };
-            if let Some(path) = dst_path {
-                let move_file = FileSystemEdit::MoveFile {
-                    src: file_id,
-                    dst_source_root: db.file_source_root(position.file_id),
-                    dst_path: path,
-                };
-                file_system_edits.push(move_file);
-            }
+            let move_file =
+                FileSystemEdit::MoveFile { src: file_id, anchor: position.file_id, dst };
+            file_system_edits.push(move_file);
         }
         ModuleSource::Module(..) => {}
     }
@@ -644,16 +635,16 @@ mod tests {
     #[test]
     fn test_rename_mod() {
         let (analysis, position) = analysis_and_position(
-            "
-            //- /lib.rs
-            mod bar;
+            r#"
+//- /lib.rs
+mod bar;
 
-            //- /bar.rs
-            mod foo<|>;
+//- /bar.rs
+mod foo<|>;
 
-            //- /bar/foo.rs
-            // emtpy
-            ",
+//- /bar/foo.rs
+// emtpy
+            "#,
         );
         let new_name = "foo2";
         let source_change = analysis.rename(position, new_name).unwrap();
@@ -683,10 +674,10 @@ mod tests {
                             src: FileId(
                                 3,
                             ),
-                            dst_source_root: SourceRootId(
-                                0,
+                            anchor: FileId(
+                                2,
                             ),
-                            dst_path: "bar/foo2.rs",
+                            dst: "foo2.rs",
                         },
                     ],
                     is_snippet: false,
@@ -699,18 +690,18 @@ mod tests {
     #[test]
     fn test_rename_mod_in_use_tree() {
         let (analysis, position) = analysis_and_position(
-            "
-            //- /main.rs
-            pub mod foo;
-            pub mod bar;
-            fn main() {}
+            r#"
+//- /main.rs
+pub mod foo;
+pub mod bar;
+fn main() {}
 
-            //- /foo.rs
-            pub struct FooContent;
+//- /foo.rs
+pub struct FooContent;
 
-            //- /bar.rs
-            use crate::foo<|>::FooContent;
-            ",
+//- /bar.rs
+use crate::foo<|>::FooContent;
+            "#,
         );
         let new_name = "qux";
         let source_change = analysis.rename(position, new_name).unwrap();
@@ -753,10 +744,10 @@ mod tests {
                             src: FileId(
                                 2,
                             ),
-                            dst_source_root: SourceRootId(
-                                0,
+                            anchor: FileId(
+                                3,
                             ),
-                            dst_path: "qux.rs",
+                            dst: "qux.rs",
                         },
                     ],
                     is_snippet: false,
@@ -769,12 +760,12 @@ mod tests {
     #[test]
     fn test_rename_mod_in_dir() {
         let (analysis, position) = analysis_and_position(
-            "
-            //- /lib.rs
-            mod fo<|>o;
-            //- /foo/mod.rs
-            // emtpy
-            ",
+            r#"
+//- /lib.rs
+mod fo<|>o;
+//- /foo/mod.rs
+// emtpy
+            "#,
         );
         let new_name = "foo2";
         let source_change = analysis.rename(position, new_name).unwrap();
@@ -804,10 +795,10 @@ mod tests {
                             src: FileId(
                                 2,
                             ),
-                            dst_source_root: SourceRootId(
-                                0,
+                            anchor: FileId(
+                                1,
                             ),
-                            dst_path: "foo2/mod.rs",
+                            dst: "../foo2/mod.rs",
                         },
                     ],
                     is_snippet: false,
@@ -844,19 +835,19 @@ mod tests {
     #[test]
     fn test_rename_mod_filename_and_path() {
         let (analysis, position) = analysis_and_position(
-            "
-            //- /lib.rs
-            mod bar;
-            fn f() {
-                bar::foo::fun()
-            }
+            r#"
+//- /lib.rs
+mod bar;
+fn f() {
+    bar::foo::fun()
+}
 
-            //- /bar.rs
-            pub mod foo<|>;
+//- /bar.rs
+pub mod foo<|>;
 
-            //- /bar/foo.rs
-            // pub fn fun() {}
-            ",
+//- /bar/foo.rs
+// pub fn fun() {}
+            "#,
         );
         let new_name = "foo2";
         let source_change = analysis.rename(position, new_name).unwrap();
@@ -899,10 +890,10 @@ mod tests {
                             src: FileId(
                                 3,
                             ),
-                            dst_source_root: SourceRootId(
-                                0,
+                            anchor: FileId(
+                                2,
                             ),
-                            dst_path: "bar/foo2.rs",
+                            dst: "foo2.rs",
                         },
                     ],
                     is_snippet: false,