diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-21 09:33:45 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-21 09:33:45 +0000 |
commit | 4f7ec0170353e61c148909d2716c915578392a7b (patch) | |
tree | c4a7a0dae2ccbc6b6d987faca8002a22d0253382 /crates/ra_analysis/src/lib.rs | |
parent | 164d53b22f345e50c67781af545310d2193e8a5c (diff) | |
parent | fd927ea3a9ea687ba11b01e56579f0287221f55c (diff) |
Merge #309
309: Fix edits r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src/lib.rs')
-rw-r--r-- | crates/ra_analysis/src/lib.rs | 11 |
1 files changed, 6 insertions, 5 deletions
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}; | |||
20 | 20 | ||
21 | use rustc_hash::FxHashMap; | 21 | use rustc_hash::FxHashMap; |
22 | use ra_syntax::{SourceFileNode, TextRange, TextUnit}; | 22 | use ra_syntax::{SourceFileNode, TextRange, TextUnit}; |
23 | use ra_text_edit::AtomTextEdit; | 23 | use ra_text_edit::TextEdit; |
24 | use rayon::prelude::*; | 24 | use rayon::prelude::*; |
25 | use relative_path::RelativePathBuf; | 25 | use relative_path::RelativePathBuf; |
26 | 26 | ||
@@ -167,18 +167,19 @@ pub struct SourceChange { | |||
167 | #[derive(Debug)] | 167 | #[derive(Debug)] |
168 | pub struct SourceFileEdit { | 168 | pub struct SourceFileEdit { |
169 | pub file_id: FileId, | 169 | pub file_id: FileId, |
170 | pub edits: Vec<AtomTextEdit>, | 170 | pub edit: TextEdit, |
171 | } | 171 | } |
172 | 172 | ||
173 | #[derive(Debug)] | 173 | #[derive(Debug)] |
174 | pub enum FileSystemEdit { | 174 | pub enum FileSystemEdit { |
175 | CreateFile { | 175 | CreateFile { |
176 | anchor: FileId, | 176 | source_root: SourceRootId, |
177 | path: RelativePathBuf, | 177 | path: RelativePathBuf, |
178 | }, | 178 | }, |
179 | MoveFile { | 179 | MoveFile { |
180 | file: FileId, | 180 | src: FileId, |
181 | path: RelativePathBuf, | 181 | dst_source_root: SourceRootId, |
182 | dst_path: RelativePathBuf, | ||
182 | }, | 183 | }, |
183 | } | 184 | } |
184 | 185 | ||