mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor AssistDirector

Browse Source
This commit is contained in:
Mikhail Rakhmanov 2020-05-22 22:47:25 +02:00
parent 04a35784df
commit 97ffe3c6e8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ra_assists/src/assist_context.rs
View File

@ -178,11 +178,10 @@ impl Assists {
label: Assist,
f: impl FnOnce(&mut AssistDirector),
) -> Option<()> {
let change_label = label.label.clone();
if !self.resolve {
return None;
}
let mut director = AssistDirector::new(change_label.clone());
let mut director = AssistDirector::new();
f(&mut director);
let changes = director.finish();
let file_edits: Vec<SourceFileEdit> =
@ -295,12 +294,11 @@ impl AssistBuilder {
pub(crate) struct AssistDirector {
source_changes: Vec<SourceChange>,
builders: FxHashMap<FileId, AssistBuilder>,
change_label: String,
}
impl AssistDirector {
fn new(change_label: String) -> AssistDirector {
AssistDirector { source_changes: vec![], builders: FxHashMap::default(), change_label }
fn new() -> AssistDirector {
AssistDirector { source_changes: vec![], builders: FxHashMap::default() }
}
pub(crate) fn perform(&mut self, file_id: FileId, f: impl FnOnce(&mut AssistBuilder)) {
@ -309,7 +307,7 @@ impl AssistDirector {
}
fn finish(mut self) -> Vec<SourceChange> {
for (file_id, builder) in
for (_, builder) in
self.builders.into_iter().collect::<Vec<(FileId, AssistBuilder)>>()
{
self.source_changes.push(builder.finish());