@@ -1693,6 +1693,7 @@ impl Editor {
self.mouse_context_menu = Some(MouseContextMenu::new(
crate::mouse_context_menu::MenuPosition::PinnedToScreen(position),
context_menu,
+ None,
window,
cx,
));
@@ -4833,6 +4834,89 @@ impl Editor {
}))
}
+ fn prepare_code_actions_task(
+ &mut self,
+ action: &ToggleCodeActions,
+ window: &mut Window,
+ cx: &mut Context<Self>,
+ ) -> Task<Option<(Entity<Buffer>, CodeActionContents)>> {
+ let snapshot = self.snapshot(window, cx);
+ let multibuffer_point = action
+ .deployed_from_indicator
+ .map(|row| DisplayPoint::new(row, 0).to_point(&snapshot))
+ .unwrap_or_else(|| self.selections.newest::<Point>(cx).head());
+
+ let Some((buffer, buffer_row)) = snapshot
+ .buffer_snapshot
+ .buffer_line_for_row(MultiBufferRow(multibuffer_point.row))
+ .and_then(|(buffer_snapshot, range)| {
+ self.buffer
+ .read(cx)
+ .buffer(buffer_snapshot.remote_id())
+ .map(|buffer| (buffer, range.start.row))
+ })
+ else {
+ return Task::ready(None);
+ };
+
+ let (_, code_actions) = self
+ .available_code_actions
+ .clone()
+ .and_then(|(location, code_actions)| {
+ let snapshot = location.buffer.read(cx).snapshot();
+ let point_range = location.range.to_point(&snapshot);
+ let point_range = point_range.start.row..=point_range.end.row;
+ if point_range.contains(&buffer_row) {
+ Some((location, code_actions))
+ } else {
+ None
+ }
+ })
+ .unzip();
+
+ let buffer_id = buffer.read(cx).remote_id();
+ let tasks = self
+ .tasks
+ .get(&(buffer_id, buffer_row))
+ .map(|t| Arc::new(t.to_owned()));
+
+ if tasks.is_none() && code_actions.is_none() {
+ return Task::ready(None);
+ }
+
+ self.completion_tasks.clear();
+ self.discard_inline_completion(false, cx);
+
+ let task_context = tasks
+ .as_ref()
+ .zip(self.project.clone())
+ .map(|(tasks, project)| {
+ Self::build_tasks_context(&project, &buffer, buffer_row, tasks, cx)
+ });
+
+ cx.spawn_in(window, async move |_, _| {
+ let task_context = match task_context {
+ Some(task_context) => task_context.await,
+ None => None,
+ };
+ let resolved_tasks = tasks.zip(task_context).map(|(tasks, task_context)| {
+ Rc::new(ResolvedTasks {
+ templates: tasks.resolve(&task_context).collect(),
+ position: snapshot
+ .buffer_snapshot
+ .anchor_before(Point::new(multibuffer_point.row, tasks.column)),
+ })
+ });
+ Some((
+ buffer,
+ CodeActionContents {
+ actions: code_actions,
+ tasks: resolved_tasks,
+ },
+ ))
+ })
+ }
+
pub fn toggle_code_actions(
&mut self,
action: &ToggleCodeActions,
@@ -4853,113 +4937,58 @@ impl Editor {
}
}
drop(context_menu);
- let snapshot = self.snapshot(window, cx);
+
let deployed_from_indicator = action.deployed_from_indicator;
let mut task = self.code_actions_task.take();
let action = action.clone();
+
cx.spawn_in(window, async move |editor, cx| {
while let Some(prev_task) = task {
prev_task.await.log_err();
task = editor.update(cx, |this, _| this.code_actions_task.take())?;
}
- let spawned_test_task = editor.update_in(cx, |editor, window, cx| {
- if editor.focus_handle.is_focused(window) {
- let multibuffer_point = action
- .deployed_from_indicator
- .map(|row| DisplayPoint::new(row, 0).to_point(&snapshot))
- .unwrap_or_else(|| editor.selections.newest::<Point>(cx).head());
- let (buffer, buffer_row) = snapshot
- .buffer_snapshot
- .buffer_line_for_row(MultiBufferRow(multibuffer_point.row))
- .and_then(|(buffer_snapshot, range)| {
- editor
- .buffer
- .read(cx)
- .buffer(buffer_snapshot.remote_id())
- .map(|buffer| (buffer, range.start.row))
- })?;
- let (_, code_actions) = editor
- .available_code_actions
- .clone()
- .and_then(|(location, code_actions)| {
- let snapshot = location.buffer.read(cx).snapshot();
- let point_range = location.range.to_point(&snapshot);
- let point_range = point_range.start.row..=point_range.end.row;
- if point_range.contains(&buffer_row) {
- Some((location, code_actions))
- } else {
- None
- }
- })
- .unzip();
- let buffer_id = buffer.read(cx).remote_id();
- let tasks = editor
- .tasks
- .get(&(buffer_id, buffer_row))
- .map(|t| Arc::new(t.to_owned()));
- if tasks.is_none() && code_actions.is_none() {
- return None;
- }
-
- editor.completion_tasks.clear();
- editor.discard_inline_completion(false, cx);
- let task_context =
- tasks
- .as_ref()
- .zip(editor.project.clone())
- .map(|(tasks, project)| {
- Self::build_tasks_context(&project, &buffer, buffer_row, tasks, cx)
- });
-
- let debugger_flag = cx.has_flag::<Debugger>();
-
- Some(cx.spawn_in(window, async move |editor, cx| {
- let task_context = match task_context {
- Some(task_context) => task_context.await,
- None => None,
- };
- let resolved_tasks =
- tasks.zip(task_context).map(|(tasks, task_context)| {
- Rc::new(ResolvedTasks {
- templates: tasks.resolve(&task_context).collect(),
- position: snapshot.buffer_snapshot.anchor_before(Point::new(
- multibuffer_point.row,
- tasks.column,
- )),
- })
- });
- let spawn_straight_away = resolved_tasks.as_ref().map_or(false, |tasks| {
- tasks
- .templates
- .iter()
- .filter(|task| {
- if matches!(task.1.task_type(), task::TaskType::Debug(_)) {
- debugger_flag
- } else {
- true
- }
- })
- .count()
- == 1
- }) && code_actions
- .as_ref()
- .map_or(true, |actions| actions.is_empty());
+ let context_menu_task = editor.update_in(cx, |editor, window, cx| {
+ if !editor.focus_handle.is_focused(window) {
+ return Some(Task::ready(Ok(())));
+ }
+ let debugger_flag = cx.has_flag::<Debugger>();
+ let code_actions_task = editor.prepare_code_actions_task(&action, window, cx);
+ Some(cx.spawn_in(window, async move |editor, cx| {
+ if let Some((buffer, code_action_contents)) = code_actions_task.await {
+ let spawn_straight_away =
+ code_action_contents.tasks.as_ref().map_or(false, |tasks| {
+ tasks
+ .templates
+ .iter()
+ .filter(|task| {
+ if matches!(task.1.task_type(), task::TaskType::Debug(_)) {
+ debugger_flag
+ } else {
+ true
+ }
+ })
+ .count()
+ == 1
+ }) && code_action_contents
+ .actions
+ .as_ref()
+ .map_or(true, |actions| actions.is_empty());
if let Ok(task) = editor.update_in(cx, |editor, window, cx| {
*editor.context_menu.borrow_mut() =
Some(CodeContextMenu::CodeActions(CodeActionsMenu {
buffer,
- actions: CodeActionContents {
- tasks: resolved_tasks,
- actions: code_actions,
- },
+ actions: code_action_contents,
selected_item: Default::default(),
scroll_handle: UniformListScrollHandle::default(),
deployed_from_indicator,
}));
if spawn_straight_away {
if let Some(task) = editor.confirm_code_action(
- &ConfirmCodeAction { item_ix: Some(0) },
+ &ConfirmCodeAction {
+ item_ix: Some(0),
+ from_mouse_context_menu: false,
+ },
window,
cx,
) {
@@ -4974,12 +5003,12 @@ impl Editor {
} else {
Ok(())
}
- }))
- } else {
- Some(Task::ready(Ok(())))
- }
+ } else {
+ Ok(())
+ }
+ }))
})?;
- if let Some(task) = spawned_test_task {
+ if let Some(task) = context_menu_task {
task.await?;
}
@@ -4996,17 +5025,27 @@ impl Editor {
) -> Option<Task<Result<()>>> {
self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
- let actions_menu =
+ let (action, buffer) = if action.from_mouse_context_menu {
+ if let Some(menu) = self.mouse_context_menu.take() {
+ let code_action = menu.code_action?;
+ let index = action.item_ix?;
+ let action = code_action.actions.get(index)?;
+ (action, code_action.buffer)
+ } else {
+ return None;
+ }
+ } else {
if let CodeContextMenu::CodeActions(menu) = self.hide_context_menu(window, cx)? {
- menu
+ let action_ix = action.item_ix.unwrap_or(menu.selected_item);
+ let action = menu.actions.get(action_ix)?;
+ let buffer = menu.buffer;
+ (action, buffer)
} else {
return None;
- };
+ }
+ };
- let action_ix = action.item_ix.unwrap_or(actions_menu.selected_item);
- let action = actions_menu.actions.get(action_ix)?;
let title = action.label();
- let buffer = actions_menu.buffer;
let workspace = self.workspace()?;
match action {
@@ -8803,6 +8842,7 @@ impl Editor {
self,
source,
clicked_point,
+ None,
context_menu,
window,
cx,
@@ -1,15 +1,22 @@
use crate::{
- Copy, CopyAndTrim, CopyPermalinkToLine, Cut, DebuggerEvaluateSelectedText, DisplayPoint,
- DisplaySnapshot, Editor, FindAllReferences, GoToDeclaration, GoToDefinition,
+ ConfirmCodeAction, Copy, CopyAndTrim, CopyPermalinkToLine, Cut, DebuggerEvaluateSelectedText,
+ DisplayPoint, DisplaySnapshot, Editor, FindAllReferences, GoToDeclaration, GoToDefinition,
GoToImplementation, GoToTypeDefinition, Paste, Rename, RevealInFileManager, SelectMode,
ToDisplayPoint, ToggleCodeActions,
actions::{Format, FormatSelections},
+ code_context_menus::CodeActionContents,
selections_collection::SelectionsCollection,
};
+use feature_flags::{Debugger, FeatureFlagAppExt as _};
use gpui::prelude::FluentBuilder;
-use gpui::{Context, DismissEvent, Entity, Focusable as _, Pixels, Point, Subscription, Window};
+use gpui::{
+ Context, DismissEvent, Entity, FocusHandle, Focusable as _, Pixels, Point, Subscription, Task,
+ Window,
+};
use std::ops::Range;
use text::PointUtf16;
+use ui::ContextMenu;
+use util::ResultExt;
use workspace::OpenInTerminal;
#[derive(Debug)]
@@ -25,12 +32,23 @@ pub enum MenuPosition {
},
}
+pub struct MouseCodeAction {
+ pub actions: CodeActionContents,
+ pub buffer: Entity<language::Buffer>,
+}
+
pub struct MouseContextMenu {
pub(crate) position: MenuPosition,
pub(crate) context_menu: Entity<ui::ContextMenu>,
+ pub(crate) code_action: Option<MouseCodeAction>,
_subscription: Subscription,
}
+enum CodeActionLoadState {
+ Loading,
+ Loaded(CodeActionContents),
+}
+
impl std::fmt::Debug for MouseContextMenu {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("MouseContextMenu")
@@ -45,6 +63,7 @@ impl MouseContextMenu {
editor: &mut Editor,
source: multi_buffer::Anchor,
position: Point<Pixels>,
+ code_action: Option<MouseCodeAction>,
context_menu: Entity<ui::ContextMenu>,
window: &mut Window,
cx: &mut Context<Editor>,
@@ -63,6 +82,7 @@ impl MouseContextMenu {
return Some(MouseContextMenu::new(
menu_position,
context_menu,
+ code_action,
window,
cx,
));
@@ -71,6 +91,7 @@ impl MouseContextMenu {
pub(crate) fn new(
position: MenuPosition,
context_menu: Entity<ui::ContextMenu>,
+ code_action: Option<MouseCodeAction>,
window: &mut Window,
cx: &mut Context<Editor>,
) -> Self {
@@ -91,6 +112,7 @@ impl MouseContextMenu {
Self {
position,
context_menu,
+ code_action,
_subscription,
}
}
@@ -129,13 +151,13 @@ pub fn deploy_context_menu(
let display_map = editor.selections.display_map(cx);
let source_anchor = display_map.display_point_to_anchor(point, text::Bias::Right);
- let context_menu = if let Some(custom) = editor.custom_context_menu.take() {
+ if let Some(custom) = editor.custom_context_menu.take() {
let menu = custom(editor, point, window, cx);
editor.custom_context_menu = Some(custom);
let Some(menu) = menu else {
return;
};
- menu
+ set_context_menu(editor, menu, source_anchor, position, None, window, cx);
} else {
// Don't show the context menu if there isn't a project associated with this editor
let Some(project) = editor.project.clone() else {
@@ -174,74 +196,223 @@ pub fn deploy_context_menu(
!filter.is_hidden(&DebuggerEvaluateSelectedText)
});
- ui::ContextMenu::build(window, cx, |menu, _window, _cx| {
- let builder = menu
- .on_blur_subscription(Subscription::new(|| {}))
- .when(evaluate_selection && has_selections, |builder| {
- builder
- .action("Evaluate Selection", Box::new(DebuggerEvaluateSelectedText))
- .separator()
- })
- .action("Go to Definition", Box::new(GoToDefinition))
- .action("Go to Declaration", Box::new(GoToDeclaration))
- .action("Go to Type Definition", Box::new(GoToTypeDefinition))
- .action("Go to Implementation", Box::new(GoToImplementation))
- .action("Find All References", Box::new(FindAllReferences))
- .separator()
- .action("Rename Symbol", Box::new(Rename))
- .action("Format Buffer", Box::new(Format))
- .when(has_selections, |cx| {
- cx.action("Format Selections", Box::new(FormatSelections))
- })
- .action(
- "Code Actions",
- Box::new(ToggleCodeActions {
- deployed_from_indicator: None,
- }),
- )
- .separator()
- .action("Cut", Box::new(Cut))
- .action("Copy", Box::new(Copy))
- .action("Copy and trim", Box::new(CopyAndTrim))
- .action("Paste", Box::new(Paste))
- .separator()
- .map(|builder| {
- let reveal_in_finder_label = if cfg!(target_os = "macos") {
- "Reveal in Finder"
- } else {
- "Reveal in File Manager"
- };
- const OPEN_IN_TERMINAL_LABEL: &str = "Open in Terminal";
- if has_reveal_target {
- builder
- .action(reveal_in_finder_label, Box::new(RevealInFileManager))
- .action(OPEN_IN_TERMINAL_LABEL, Box::new(OpenInTerminal))
- } else {
- builder
- .disabled_action(reveal_in_finder_label, Box::new(RevealInFileManager))
- .disabled_action(OPEN_IN_TERMINAL_LABEL, Box::new(OpenInTerminal))
- }
- })
- .map(|builder| {
- const COPY_PERMALINK_LABEL: &str = "Copy Permalink";
- if has_git_repo {
- builder.action(COPY_PERMALINK_LABEL, Box::new(CopyPermalinkToLine))
+ let menu = build_context_menu(
+ focus,
+ has_selections,
+ has_reveal_target,
+ has_git_repo,
+ evaluate_selection,
+ Some(CodeActionLoadState::Loading),
+ window,
+ cx,
+ );
+
+ set_context_menu(editor, menu, source_anchor, position, None, window, cx);
+
+ let mut actions_task = editor.code_actions_task.take();
+ cx.spawn_in(window, async move |editor, cx| {
+ while let Some(prev_task) = actions_task {
+ prev_task.await.log_err();
+ actions_task = editor.update(cx, |this, _| this.code_actions_task.take())?;
+ }
+ let action = ToggleCodeActions {
+ deployed_from_indicator: Some(point.row()),
+ };
+ let context_menu_task = editor.update_in(cx, |editor, window, cx| {
+ let code_actions_task = editor.prepare_code_actions_task(&action, window, cx);
+ Some(cx.spawn_in(window, async move |editor, cx| {
+ let code_action_result = code_actions_task.await;
+ if let Ok(editor_task) = editor.update_in(cx, |editor, window, cx| {
+ let Some(mouse_context_menu) = editor.mouse_context_menu.take() else {
+ return Task::ready(Ok::<_, anyhow::Error>(()));
+ };
+ if mouse_context_menu
+ .context_menu
+ .focus_handle(cx)
+ .contains_focused(window, cx)
+ {
+ window.focus(&editor.focus_handle(cx));
+ }
+ drop(mouse_context_menu);
+ let (state, code_action) =
+ if let Some((buffer, actions)) = code_action_result {
+ (
+ CodeActionLoadState::Loaded(actions.clone()),
+ Some(MouseCodeAction { actions, buffer }),
+ )
+ } else {
+ (
+ CodeActionLoadState::Loaded(CodeActionContents::default()),
+ None,
+ )
+ };
+ let menu = build_context_menu(
+ window.focused(cx),
+ has_selections,
+ has_reveal_target,
+ has_git_repo,
+ evaluate_selection,
+ Some(state),
+ window,
+ cx,
+ );
+ set_context_menu(
+ editor,
+ menu,
+ source_anchor,
+ position,
+ code_action,
+ window,
+ cx,
+ );
+ Task::ready(Ok(()))
+ }) {
+ editor_task.await
} else {
- builder.disabled_action(COPY_PERMALINK_LABEL, Box::new(CopyPermalinkToLine))
+ Ok(())
}
- });
- match focus {
- Some(focus) => builder.context(focus),
- None => builder,
+ }))
+ })?;
+ if let Some(task) = context_menu_task {
+ task.await?;
}
+ Ok::<_, anyhow::Error>(())
})
+ .detach_and_log_err(cx);
};
+}
+fn build_context_menu(
+ focus: Option<FocusHandle>,
+ has_selections: bool,
+ has_reveal_target: bool,
+ has_git_repo: bool,
+ evaluate_selection: bool,
+ code_action_load_state: Option<CodeActionLoadState>,
+ window: &mut Window,
+ cx: &mut Context<Editor>,
+) -> Entity<ContextMenu> {
+ ui::ContextMenu::build(window, cx, |menu, _window, cx| {
+ let menu = menu
+ .on_blur_subscription(Subscription::new(|| {}))
+ .when_some(code_action_load_state, |menu, state| {
+ match state {
+ CodeActionLoadState::Loading => menu.disabled_action(
+ "Loading code actions...",
+ Box::new(ConfirmCodeAction {
+ item_ix: None,
+ from_mouse_context_menu: true,
+ }),
+ ),
+ CodeActionLoadState::Loaded(actions) => {
+ if actions.is_empty() {
+ menu.disabled_action(
+ "No code actions available",
+ Box::new(ConfirmCodeAction {
+ item_ix: None,
+ from_mouse_context_menu: true,
+ }),
+ )
+ } else {
+ actions
+ .iter()
+ .filter(|action| {
+ if action
+ .as_task()
+ .map(|task| {
+ matches!(task.task_type(), task::TaskType::Debug(_))
+ })
+ .unwrap_or(false)
+ {
+ cx.has_flag::<Debugger>()
+ } else {
+ true
+ }
+ })
+ .enumerate()
+ .fold(menu, |menu, (ix, action)| {
+ menu.action(
+ action.label(),
+ Box::new(ConfirmCodeAction {
+ item_ix: Some(ix),
+ from_mouse_context_menu: true,
+ }),
+ )
+ })
+ }
+ }
+ }
+ .separator()
+ })
+ .when(evaluate_selection && has_selections, |builder| {
+ builder
+ .action("Evaluate Selection", Box::new(DebuggerEvaluateSelectedText))
+ .separator()
+ })
+ .action("Go to Definition", Box::new(GoToDefinition))
+ .action("Go to Declaration", Box::new(GoToDeclaration))
+ .action("Go to Type Definition", Box::new(GoToTypeDefinition))
+ .action("Go to Implementation", Box::new(GoToImplementation))
+ .action("Find All References", Box::new(FindAllReferences))
+ .separator()
+ .action("Rename Symbol", Box::new(Rename))
+ .action("Format Buffer", Box::new(Format))
+ .when(has_selections, |cx| {
+ cx.action("Format Selections", Box::new(FormatSelections))
+ })
+ .separator()
+ .action("Cut", Box::new(Cut))
+ .action("Copy", Box::new(Copy))
+ .action("Copy and trim", Box::new(CopyAndTrim))
+ .action("Paste", Box::new(Paste))
+ .separator()
+ .map(|builder| {
+ let reveal_in_finder_label = if cfg!(target_os = "macos") {
+ "Reveal in Finder"
+ } else {
+ "Reveal in File Manager"
+ };
+ const OPEN_IN_TERMINAL_LABEL: &str = "Open in Terminal";
+ if has_reveal_target {
+ builder
+ .action(reveal_in_finder_label, Box::new(RevealInFileManager))
+ .action(OPEN_IN_TERMINAL_LABEL, Box::new(OpenInTerminal))
+ } else {
+ builder
+ .disabled_action(reveal_in_finder_label, Box::new(RevealInFileManager))
+ .disabled_action(OPEN_IN_TERMINAL_LABEL, Box::new(OpenInTerminal))
+ }
+ })
+ .map(|builder| {
+ const COPY_PERMALINK_LABEL: &str = "Copy Permalink";
+ if has_git_repo {
+ builder.action(COPY_PERMALINK_LABEL, Box::new(CopyPermalinkToLine))
+ } else {
+ builder.disabled_action(COPY_PERMALINK_LABEL, Box::new(CopyPermalinkToLine))
+ }
+ });
+ match focus {
+ Some(focus) => menu.context(focus),
+ None => menu,
+ }
+ })
+}
+
+fn set_context_menu(
+ editor: &mut Editor,
+ context_menu: Entity<ui::ContextMenu>,
+ source_anchor: multi_buffer::Anchor,
+ position: Option<Point<Pixels>>,
+ code_action: Option<MouseCodeAction>,
+ window: &mut Window,
+ cx: &mut Context<Editor>,
+) {
editor.mouse_context_menu = match position {
Some(position) => MouseContextMenu::pinned_to_editor(
editor,
source_anchor,
position,
+ code_action,
context_menu,
window,
cx,
@@ -255,6 +426,7 @@ pub fn deploy_context_menu(
Some(MouseContextMenu::new(
menu_position,
context_menu,
+ code_action,
window,
cx,
))