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

zed2(ish) Cancel completion resolution when new list

Browse source
This commit is contained in:
Julia 2023-11-22 16:26:27 -05:00
parent 62b1843704
commit 37e3cc1291
1 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

47
crates/editor2/src/editor.rs
View file

@ -966,20 +966,22 @@ impl CompletionsMenu {
fn pre_resolve_completion_documentation( fn pre_resolve_completion_documentation(
&self, &self,
project: Option<Model<Project>>, _editor: &Editor,
cx: &mut ViewContext<Editor>, _cx: &mut ViewContext<Editor>,
) { ) -> Option<Task<()>> {
// todo!("implementation below "); // todo!("implementation below ");
None
} }
// ) { // {
// let settings = EditorSettings::get_global(cx); // let settings = EditorSettings::get_global(cx);
// if !settings.show_completion_documentation { // if !settings.show_completion_documentation {
// return; // return None;
// } // }
// let Some(project) = project else { // let Some(project) = editor.project.clone() else {
// return; // return None;
// }; // };
// let client = project.read(cx).client(); // let client = project.read(cx).client();
// let language_registry = project.read(cx).languages().clone(); // let language_registry = project.read(cx).languages().clone();
@ -989,7 +991,7 @@ impl CompletionsMenu {
// let completions = self.completions.clone(); // let completions = self.completions.clone();
// let completion_indices: Vec<_> = self.matches.iter().map(|m| m.candidate_id).collect(); // let completion_indices: Vec<_> = self.matches.iter().map(|m| m.candidate_id).collect();
// cx.spawn(move |this, mut cx| async move { // Some(cx.spawn(move |this, mut cx| async move {
// if is_remote { // if is_remote {
// let Some(project_id) = project_id else { // let Some(project_id) = project_id else {
// log::error!("Remote project without remote_id"); // log::error!("Remote project without remote_id");
@ -1051,8 +1053,7 @@ impl CompletionsMenu {
// _ = this.update(&mut cx, |_, cx| cx.notify()); // _ = this.update(&mut cx, |_, cx| cx.notify());
// } // }
// } // }
// }) // }))
// .detach();
// } // }
fn attempt_resolve_selected_completion_documentation( fn attempt_resolve_selected_completion_documentation(
@ -3596,7 +3597,8 @@ impl Editor {
let id = post_inc(&mut self.next_completion_id); let id = post_inc(&mut self.next_completion_id);
let task = cx.spawn(|this, mut cx| { let task = cx.spawn(|this, mut cx| {
async move { async move {
let menu = if let Some(completions) = completions.await.log_err() { let completions = completions.await.log_err();
let (menu, pre_resolve_task) = if let Some(completions) = completions {
let mut menu = CompletionsMenu { let mut menu = CompletionsMenu {
id, id,
initial_position: position, initial_position: position,
@ -3619,20 +3621,24 @@ impl Editor {
}; };
menu.filter(query.as_deref(), cx.background_executor().clone()) menu.filter(query.as_deref(), cx.background_executor().clone())
.await; .await;
if menu.matches.is_empty() { if menu.matches.is_empty() {
None (None, None)
} else { } else {
_ = this.update(&mut cx, |editor, cx| { let pre_resolve_task = this
menu.pre_resolve_completion_documentation(editor.project.clone(), cx); .update(&mut cx, |editor, cx| {
}); menu.pre_resolve_completion_documentation(editor, cx)
Some(menu) })
.ok()
.flatten();
(Some(menu), pre_resolve_task)
} }
} else { } else {
None (None, None)
}; };
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
this.completion_tasks.retain(|(task_id, _)| *task_id > id); this.completion_tasks.retain(|(task_id, _)| *task_id >= id);
let mut context_menu = this.context_menu.write(); let mut context_menu = this.context_menu.write();
match context_menu.as_ref() { match context_menu.as_ref() {
@ -3664,10 +3670,15 @@ impl Editor {
} }
})?; })?;
if let Some(pre_resolve_task) = pre_resolve_task {
pre_resolve_task.await;
}
Ok::<_, anyhow::Error>(()) Ok::<_, anyhow::Error>(())
} }
.log_err() .log_err()
}); });
self.completion_tasks.push((id, task)); self.completion_tasks.push((id, task));
} }