Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor AssistBuilder to manage a SourceChange

Browse source 
`AssistBuilder`` now managaes a full `SourceChange` instead of a
Vec<SourceFileEdit>.

This prepares AssistBuilder to handle creation of new files.
This commit is contained in:
Christoph Herzog 2020-07-07 12:10:18 +02:00
parent d4bc2f25de
commit 3360118040
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/ra_assists/src/assist_context.rs
View file

@ -176,7 +176,7 @@ pub(crate) struct AssistBuilder {
edit: TextEditBuilder, edit: TextEditBuilder,
file_id: FileId, file_id: FileId,
is_snippet: bool, is_snippet: bool,
edits: Vec<SourceFileEdit>, change: SourceChange,
} }
impl AssistBuilder { impl AssistBuilder {
@ -185,7 +185,7 @@ impl AssistBuilder {
edit: TextEditBuilder::default(), edit: TextEditBuilder::default(),
file_id, file_id,
is_snippet: false, is_snippet: false,
edits: Vec::new(), change: SourceChange::default(),
} }
} }
@ -197,8 +197,8 @@ impl AssistBuilder {
let edit = mem::take(&mut self.edit).finish(); let edit = mem::take(&mut self.edit).finish();
if !edit.is_empty() { if !edit.is_empty() {
let new_edit = SourceFileEdit { file_id: self.file_id, edit }; let new_edit = SourceFileEdit { file_id: self.file_id, edit };
assert!(!self.edits.iter().any(|it| it.file_id == new_edit.file_id)); assert!(!self.change.source_file_edits.iter().any(|it| it.file_id == new_edit.file_id));
self.edits.push(new_edit); self.change.source_file_edits.push(new_edit);
} }
} }
@ -265,10 +265,10 @@ impl AssistBuilder {
fn finish(mut self) -> SourceChange { fn finish(mut self) -> SourceChange {
self.commit(); self.commit();
let mut res: SourceChange = mem::take(&mut self.edits).into(); let mut change = mem::take(&mut self.change);
if self.is_snippet { if self.is_snippet {
res.is_snippet = true; change.is_snippet = true;
} }
res change
} }
} }

2
crates/ra_ide_db/src/source_change.rs
View file

@ -6,7 +6,7 @@
use ra_db::FileId; use ra_db::FileId;
use ra_text_edit::TextEdit; use ra_text_edit::TextEdit;
#[derive(Debug, Clone)] #[derive(Default, Debug, Clone)]
pub struct SourceChange { pub struct SourceChange {
pub source_file_edits: Vec<SourceFileEdit>, pub source_file_edits: Vec<SourceFileEdit>,
pub file_system_edits: Vec<FileSystemEdit>, pub file_system_edits: Vec<FileSystemEdit>,