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

Make editor's ContextMenu no longer depend on project in it's api

Browse source
This commit is contained in:
Piotr Osiewicz 2023-11-01 00:44:29 +01:00
parent b11d1e2db8
commit a9e3d8c9a4
1 changed files with 30 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -666,6 +666,7 @@ impl CodeCompletionsProvider for ModelHandle<CodeCompletions> {
}); });
let id = self.update(cx, |this, _| post_inc(&mut this.next_completion_id)); let id = self.update(cx, |this, _| post_inc(&mut this.next_completion_id));
let that = self.clone(); let that = self.clone();
let project = self.update(cx, |this, _| this.project.clone());
let task = cx.spawn(move |this, mut cx| { let task = cx.spawn(move |this, mut cx| {
async move { async move {
let menu = if let Some(completions) = completions.await.log_err() { let menu = if let Some(completions) = completions.await.log_err() {
@ -688,13 +689,14 @@ impl CodeCompletionsProvider for ModelHandle<CodeCompletions> {
matches: Vec::new().into(), matches: Vec::new().into(),
selected_item: 0, selected_item: 0,
list: Default::default(), list: Default::default(),
project,
}; };
menu.filter(query.as_deref(), cx.background()).await; menu.filter(query.as_deref(), cx.background()).await;
if menu.matches.is_empty() { if menu.matches.is_empty() {
None None
} else { } else {
_ = this.update(&mut cx, |editor, cx| { _ = this.update(&mut cx, |_, cx| {
menu.pre_resolve_completion_documentation(editor.project.clone(), cx); menu.pre_resolve_completion_documentation(cx);
}); });
Some(menu) Some(menu)
} }
@ -1779,14 +1781,10 @@ enum ContextMenu {
} }
impl ContextMenu { impl ContextMenu {
fn select_first( fn select_first(&mut self, cx: &mut ViewContext<Editor>) -> bool {
&mut self,
project: Option<&ModelHandle<Project>>,
cx: &mut ViewContext<Editor>,
) -> bool {
if self.visible() { if self.visible() {
match self { match self {
ContextMenu::Completions(menu) => menu.select_first(project, cx), ContextMenu::Completions(menu) => menu.select_first(cx),
ContextMenu::CodeActions(menu) => menu.select_first(cx), ContextMenu::CodeActions(menu) => menu.select_first(cx),
} }
true true
@ -1795,14 +1793,10 @@ impl ContextMenu {
} }
} }
fn select_prev( fn select_prev(&mut self, cx: &mut ViewContext<Editor>) -> bool {
&mut self,
project: Option<&ModelHandle<Project>>,
cx: &mut ViewContext<Editor>,
) -> bool {
if self.visible() { if self.visible() {
match self { match self {
ContextMenu::Completions(menu) => menu.select_prev(project, cx), ContextMenu::Completions(menu) => menu.select_prev(cx),
ContextMenu::CodeActions(menu) => menu.select_prev(cx), ContextMenu::CodeActions(menu) => menu.select_prev(cx),
} }
true true
@ -1811,14 +1805,10 @@ impl ContextMenu {
} }
} }
fn select_next( fn select_next(&mut self, cx: &mut ViewContext<Editor>) -> bool {
&mut self,
project: Option<&ModelHandle<Project>>,
cx: &mut ViewContext<Editor>,
) -> bool {
if self.visible() { if self.visible() {
match self { match self {
ContextMenu::Completions(menu) => menu.select_next(project, cx), ContextMenu::Completions(menu) => menu.select_next(cx),
ContextMenu::CodeActions(menu) => menu.select_next(cx), ContextMenu::CodeActions(menu) => menu.select_next(cx),
} }
true true
@ -1827,14 +1817,10 @@ impl ContextMenu {
} }
} }
fn select_last( fn select_last(&mut self, cx: &mut ViewContext<Editor>) -> bool {
&mut self,
project: Option<&ModelHandle<Project>>,
cx: &mut ViewContext<Editor>,
) -> bool {
if self.visible() { if self.visible() {
match self { match self {
ContextMenu::Completions(menu) => menu.select_last(project, cx), ContextMenu::Completions(menu) => menu.select_last(cx),
ContextMenu::CodeActions(menu) => menu.select_last(cx), ContextMenu::CodeActions(menu) => menu.select_last(cx),
} }
true true
@ -1874,74 +1860,53 @@ struct CompletionsMenu {
matches: Arc<[StringMatch]>, matches: Arc<[StringMatch]>,
selected_item: usize, selected_item: usize,
list: UniformListState, list: UniformListState,
project: ModelHandle<Project>,
} }
impl CompletionsMenu { impl CompletionsMenu {
fn select_first( fn select_first(&mut self, cx: &mut ViewContext<Editor>) {
&mut self,
project: Option<&ModelHandle<Project>>,
cx: &mut ViewContext<Editor>,
) {
self.selected_item = 0; self.selected_item = 0;
self.list.scroll_to(ScrollTarget::Show(self.selected_item)); self.list.scroll_to(ScrollTarget::Show(self.selected_item));
self.attempt_resolve_selected_completion_documentation(project, cx); self.attempt_resolve_selected_completion_documentation(cx);
cx.notify(); cx.notify();
} }
fn select_prev( fn select_prev(&mut self, cx: &mut ViewContext<Editor>) {
&mut self,
project: Option<&ModelHandle<Project>>,
cx: &mut ViewContext<Editor>,
) {
if self.selected_item > 0 { if self.selected_item > 0 {
self.selected_item -= 1; self.selected_item -= 1;
} else { } else {
self.selected_item = self.matches.len() - 1; self.selected_item = self.matches.len() - 1;
} }
self.list.scroll_to(ScrollTarget::Show(self.selected_item)); self.list.scroll_to(ScrollTarget::Show(self.selected_item));
self.attempt_resolve_selected_completion_documentation(project, cx); self.attempt_resolve_selected_completion_documentation(cx);
cx.notify(); cx.notify();
} }
fn select_next( fn select_next(&mut self, cx: &mut ViewContext<Editor>) {
&mut self,
project: Option<&ModelHandle<Project>>,
cx: &mut ViewContext<Editor>,
) {
if self.selected_item + 1 < self.matches.len() { if self.selected_item + 1 < self.matches.len() {
self.selected_item += 1; self.selected_item += 1;
} else { } else {
self.selected_item = 0; self.selected_item = 0;
} }
self.list.scroll_to(ScrollTarget::Show(self.selected_item)); self.list.scroll_to(ScrollTarget::Show(self.selected_item));
self.attempt_resolve_selected_completion_documentation(project, cx); self.attempt_resolve_selected_completion_documentation(cx);
cx.notify(); cx.notify();
} }
fn select_last( fn select_last(&mut self, cx: &mut ViewContext<Editor>) {
&mut self,
project: Option<&ModelHandle<Project>>,
cx: &mut ViewContext<Editor>,
) {
self.selected_item = self.matches.len() - 1; self.selected_item = self.matches.len() - 1;
self.list.scroll_to(ScrollTarget::Show(self.selected_item)); self.list.scroll_to(ScrollTarget::Show(self.selected_item));
self.attempt_resolve_selected_completion_documentation(project, cx); self.attempt_resolve_selected_completion_documentation(cx);
cx.notify(); cx.notify();
} }
fn pre_resolve_completion_documentation( fn pre_resolve_completion_documentation(&self, cx: &mut ViewContext<Editor>) {
&self,
project: Option<ModelHandle<Project>>,
cx: &mut ViewContext<Editor>,
) {
let settings = settings::get::<EditorSettings>(cx); let settings = settings::get::<EditorSettings>(cx);
if !settings.show_completion_documentation { if !settings.show_completion_documentation {
return; return;
} }
let Some(project) = project else { let project = self.project.clone();
return;
};
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();
@ -2017,20 +1982,14 @@ impl CompletionsMenu {
.detach(); .detach();
} }
fn attempt_resolve_selected_completion_documentation( fn attempt_resolve_selected_completion_documentation(&mut self, cx: &mut ViewContext<Editor>) {
&mut self,
project: Option<&ModelHandle<Project>>,
cx: &mut ViewContext<Editor>,
) {
let settings = settings::get::<EditorSettings>(cx); let settings = settings::get::<EditorSettings>(cx);
if !settings.show_completion_documentation { if !settings.show_completion_documentation {
return; return;
} }
let completion_index = self.matches[self.selected_item].candidate_id; let completion_index = self.matches[self.selected_item].candidate_id;
let Some(project) = project else { let project = &self.project;
return;
};
let language_registry = project.read(cx).languages().clone(); let language_registry = project.read(cx).languages().clone();
let completions = self.completions.clone(); let completions = self.completions.clone();
@ -6597,7 +6556,7 @@ impl Editor {
.context_menu .context_menu
.write() .write()
.as_mut() .as_mut()
.map(|menu| menu.select_last(self.project.as_ref(), cx)) .map(|menu| menu.select_last(cx))
.unwrap_or(false) .unwrap_or(false)
{ {
return; return;
@ -6651,25 +6610,25 @@ impl Editor {
pub fn context_menu_first(&mut self, _: &ContextMenuFirst, cx: &mut ViewContext<Self>) { pub fn context_menu_first(&mut self, _: &ContextMenuFirst, cx: &mut ViewContext<Self>) {
if let Some(context_menu) = self.context_menu.write().as_mut() { if let Some(context_menu) = self.context_menu.write().as_mut() {
context_menu.select_first(self.project.as_ref(), cx); context_menu.select_first(cx);
} }
} }
pub fn context_menu_prev(&mut self, _: &ContextMenuPrev, cx: &mut ViewContext<Self>) { pub fn context_menu_prev(&mut self, _: &ContextMenuPrev, cx: &mut ViewContext<Self>) {
if let Some(context_menu) = self.context_menu.write().as_mut() { if let Some(context_menu) = self.context_menu.write().as_mut() {
context_menu.select_prev(self.project.as_ref(), cx); context_menu.select_prev(cx);
} }
} }
pub fn context_menu_next(&mut self, _: &ContextMenuNext, cx: &mut ViewContext<Self>) { pub fn context_menu_next(&mut self, _: &ContextMenuNext, cx: &mut ViewContext<Self>) {
if let Some(context_menu) = self.context_menu.write().as_mut() { if let Some(context_menu) = self.context_menu.write().as_mut() {
context_menu.select_next(self.project.as_ref(), cx); context_menu.select_next(cx);
} }
} }
pub fn context_menu_last(&mut self, _: &ContextMenuLast, cx: &mut ViewContext<Self>) { pub fn context_menu_last(&mut self, _: &ContextMenuLast, cx: &mut ViewContext<Self>) {
if let Some(context_menu) = self.context_menu.write().as_mut() { if let Some(context_menu) = self.context_menu.write().as_mut() {
context_menu.select_last(self.project.as_ref(), cx); context_menu.select_last(cx);
} }
} }