Merge #309

309: Fix edits r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 13 insertions, 10 deletions

diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index cefe5a748..5701e1ae2 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -368,10 +368,11 @@ impl AnalysisImpl {
             .collect::<Vec<_>>();
         if let Some(m) = source_binder::module_from_file_id(&*self.db, file_id)? {
             for (name_node, problem) in m.problems(&*self.db) {
+                let source_root = self.db.file_source_root(file_id);
                 let diag = match problem {
                     Problem::UnresolvedModule { candidate } => {
                         let create_file = FileSystemEdit::CreateFile {
-                            anchor: file_id,
+                            source_root,
                             path: candidate.clone(),
                         };
                         let fix = SourceChange {
@@ -388,11 +389,12 @@ impl AnalysisImpl {
                     }
                     Problem::NotDirOwner { move_to, candidate } => {
                         let move_file = FileSystemEdit::MoveFile {
-                            file: file_id,
-                            path: move_to.clone(),
+                            src: file_id,
+                            dst_source_root: source_root,
+                            dst_path: move_to.clone(),
                         };
                         let create_file = FileSystemEdit::CreateFile {
-                            anchor: file_id,
+                            source_root,
                             path: move_to.join(candidate),
                         };
                         let fix = SourceChange {
@@ -520,7 +522,7 @@ impl SourceChange {
     pub(crate) fn from_local_edit(file_id: FileId, label: &str, edit: LocalEdit) -> SourceChange {
         let file_edit = SourceFileEdit {
             file_id,
-            edits: edit.edit.into_atoms(),
+            edit: edit.edit,
         };
         SourceChange {
             label: label.to_string(),
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index d5725ef2e..c7e7dc1c0 100644
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -20,7 +20,7 @@ use std::{fmt, sync::Arc};
 
 use rustc_hash::FxHashMap;
 use ra_syntax::{SourceFileNode, TextRange, TextUnit};
-use ra_text_edit::AtomTextEdit;
+use ra_text_edit::TextEdit;
 use rayon::prelude::*;
 use relative_path::RelativePathBuf;
 
@@ -167,18 +167,19 @@ pub struct SourceChange {
 #[derive(Debug)]
 pub struct SourceFileEdit {
     pub file_id: FileId,
-    pub edits: Vec<AtomTextEdit>,
+    pub edit: TextEdit,
 }
 
 #[derive(Debug)]
 pub enum FileSystemEdit {
     CreateFile {
-        anchor: FileId,
+        source_root: SourceRootId,
         path: RelativePathBuf,
     },
     MoveFile {
-        file: FileId,
-        path: RelativePathBuf,
+        src: FileId,
+        dst_source_root: SourceRootId,
+        dst_path: RelativePathBuf,
     },
 }