Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Return an option task from confirm_completion

Browse source
This commit is contained in:
Max Brunsfeld 2022-02-01 14:27:01 -08:00
parent 55cc7bb868
commit 1371a20e58
4 changed files with 36 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

31
crates/editor/src/editor.rs
View file

@ -297,7 +297,9 @@ pub fn init(cx: &mut MutableAppContext, path_openers: &mut Vec<Box<dyn PathOpene
cx.add_action(Editor::fold_selected_ranges);
cx.add_action(Editor::show_completions);
cx.add_action(|editor: &mut Editor, _: &ConfirmCompletion, cx| {
editor.confirm_completion(cx).detach_and_log_err(cx);
if let Some(task) = editor.confirm_completion(cx) {
task.detach_and_log_err(cx);
}
});
}
@ -1648,20 +1650,17 @@ impl Editor {
self.completion_state.take()
}
fn confirm_completion(&mut self, cx: &mut ViewContext<Self>) -> Task<Result<()>> {
if let Some(completion_state) = self.hide_completions(cx) {
if let Some(completion) = completion_state
.matches
.get(completion_state.selected_item)
.and_then(|mat| completion_state.completions.get(mat.candidate_id))
{
return self.buffer.update(cx, |buffer, cx| {
buffer.apply_completion(completion.clone(), cx)
});
}
}
Task::ready(Ok(()))
fn confirm_completion(&mut self, cx: &mut ViewContext<Self>) -> Option<Task<Result<()>>> {
let completion_state = self.hide_completions(cx)?;
let mat = completion_state
.matches
.get(completion_state.selected_item)?;
let completion = completion_state.completions.get(mat.candidate_id)?;
self.buffer.update(cx, |buffer, cx| {
let mut completion = completion.clone();
// completion.
buffer.apply_completion(completion, cx)
})
}
pub fn has_completions(&self) -> bool {
@ -6658,7 +6657,7 @@ mod tests {
let apply_additional_edits = editor.update(&mut cx, |editor, cx| {
editor.move_down(&MoveDown, cx);
let apply_additional_edits = editor.confirm_completion(cx);
let apply_additional_edits = editor.confirm_completion(cx).unwrap();
assert_eq!(
editor.text(cx),
"

16
crates/editor/src/multi_buffer.rs
View file

@ -1,7 +1,7 @@
mod anchor;
pub use anchor::{Anchor, AnchorRangeExt};
use anyhow::{anyhow, Result};
use anyhow::Result;
use clock::ReplicaId;
use collections::{HashMap, HashSet};
use gpui::{AppContext, Entity, ModelContext, ModelHandle, Task};
@ -933,17 +933,13 @@ impl MultiBuffer {
&self,
completion: Completion<Anchor>,
cx: &mut ModelContext<Self>,
) -> Task<Result<()>> {
let buffer = if let Some(buffer) = self
) -> Option<Task<Result<()>>> {
let buffer = self
.buffers
.borrow()
.get(&completion.old_range.start.buffer_id)
{
buffer.buffer.clone()
} else {
return Task::ready(Err(anyhow!("completion cannot be applied to any buffer")));
};
.get(&completion.old_range.start.buffer_id)?
.buffer
.clone();
buffer.update(cx, |buffer, cx| {
buffer.apply_completion(
Completion {