zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor closure to extract async

Browse Source
This commit is contained in:
Isaac Clayton 2022-07-05 09:27:03 +02:00
parent 7d128e81aa
commit 4dad2eb7d7
1 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
crates/project/src/project.rs
View File

@ -3485,11 +3485,18 @@ impl Project {
Default::default()
};
source_buffer_handle.read_with(&cx, |this, _| {
struct PartialCompletion<F: Future<Output = Option<CodeLabel>>> {
pub old_range: Range<Anchor>,
pub new_text: String,
pub label: Option<F>,
pub lsp_completion: lsp::CompletionItem,
}
let partial_completions = source_buffer_handle.read_with(&cx, |this, _| {
let snapshot = this.snapshot();
let clipped_position = this.clip_point_utf16(position, Bias::Left);
let mut range_for_token = None;
let result = Vec::new();
let mut partial_completions = Vec::new();
for lsp_completion in completions.into_iter() {
// For now, we can only handle additional edits if they are returned
@ -3601,29 +3608,49 @@ impl Project {
}
};
let completion = Completion {
let label = match language.as_ref() {
Some(l) => Some(l.label_for_completion(&lsp_completion)),
None => None,
};
let partial_completion = PartialCompletion {
old_range,
new_text,
label: {
match language.as_ref() {
Some(l) => l.label_for_completion(&lsp_completion).await,
label,
lsp_completion,
};
partial_completions.push(partial_completion);
}
partial_completions
});
let mut result = Vec::new();
for pc in partial_completions.into_iter() {
let label = match pc.label {
Some(label) => label.await,
None => None,
}
.unwrap_or_else(|| {
CodeLabel::plain(
lsp_completion.label.clone(),
lsp_completion.filter_text.as_deref(),
pc.lsp_completion.label.clone(),
pc.lsp_completion.filter_text.as_deref(),
)
})
},
lsp_completion,
});
let completion = Completion {
old_range: pc.old_range,
new_text: pc.new_text,
label,
lsp_completion: pc.lsp_completion,
};
result.push(completion);
}
Ok(result)
})
})
} else if let Some(project_id) = self.remote_id() {
let rpc = self.client.clone();
let message = proto::GetCompletions {