From b5b44659a42cf982590519317ede9ead354f9c4e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 21 Dec 2018 12:18:14 +0300 Subject: edits use source-root API --- crates/ra_analysis/src/imp.rs | 10 ++++++---- crates/ra_analysis/src/lib.rs | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'crates/ra_analysis/src') diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index a7be56f5a..5701e1ae2 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs @@ -368,10 +368,11 @@ impl AnalysisImpl { .collect::>(); 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 { diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index 2fb11365c..c7e7dc1c0 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs @@ -173,12 +173,13 @@ pub struct SourceFileEdit { #[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, }, } -- cgit v1.2.3