diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json index c4cfed2916..cd353d7767 100644 --- a/assets/keymaps/default.json +++ b/assets/keymaps/default.json @@ -350,7 +350,7 @@ "ctrl-space": "editor::ShowCompletions", "cmd-.": "editor::ToggleCodeActions", "alt-cmd-r": "editor::RevealInFinder", - "ctrl-cmd-c": "editor::ShowCursors" + "ctrl-cmd-c": "editor::DisplayCursorNames" } }, { diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs index dd489c0393..4edc1d12ea 100644 --- a/crates/editor/src/actions.rs +++ b/crates/editor/src/actions.rs @@ -214,6 +214,6 @@ gpui::actions!( Undo, UndoSelection, UnfoldLines, - ShowCursors + DisplayCursorNames ] ); diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 7de6a69f11..b31dd54208 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -367,7 +367,7 @@ pub struct Editor { project: Option>, collaboration_hub: Option>, blink_manager: Model, - display_cursors: bool, + show_cursor_names: bool, hovered_cursor: Option, pub show_local_selections: bool, mode: EditorMode, @@ -1613,7 +1613,7 @@ impl Editor { pixel_position_of_newest_cursor: None, gutter_width: Default::default(), style: None, - display_cursors: false, + show_cursor_names: false, hovered_cursor: Default::default(), editor_actions: Default::default(), show_copilot_suggestions: mode == EditorMode::Full, @@ -3899,17 +3899,17 @@ impl Editor { self.update_visible_copilot_suggestion(cx); } - pub fn show_cursors(&mut self, _: &ShowCursors, cx: &mut ViewContext) { - self.display_cursors(cx); + pub fn display_cursor_names(&mut self, _: &DisplayCursorNames, cx: &mut ViewContext) { + self.show_cursor_names(cx); } - fn display_cursors(&mut self, cx: &mut ViewContext) { - self.display_cursors = true; + fn show_cursor_names(&mut self, cx: &mut ViewContext) { + self.show_cursor_names = true; cx.notify(); cx.spawn(|this, mut cx| async move { cx.background_executor().timer(Duration::from_secs(2)).await; this.update(&mut cx, |this, cx| { - this.display_cursors = false; + this.show_cursor_names = false; cx.notify() }) .ok() @@ -9021,7 +9021,7 @@ impl Editor { cx.focus(&rename_editor_focus_handle); } else { self.blink_manager.update(cx, BlinkManager::enable); - self.display_cursors(cx); + self.show_cursor_names(cx); self.buffer.update(cx, |buffer, cx| { buffer.finalize_last_transaction(cx); if self.leader_peer_id.is_none() { diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 7e35ff61ac..1c4fafb268 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -327,7 +327,7 @@ impl EditorElement { register_action(view, cx, Editor::context_menu_prev); register_action(view, cx, Editor::context_menu_next); register_action(view, cx, Editor::context_menu_last); - register_action(view, cx, Editor::show_cursors); + register_action(view, cx, Editor::display_cursor_names); } fn register_key_listeners(&self, cx: &mut WindowContext) { @@ -2001,7 +2001,7 @@ impl EditorElement { if Some(selection.peer_id) == editor.leader_peer_id { continue; } - let is_shown = editor.display_cursors || editor.hovered_cursor.as_ref().is_some_and(|c| c.replica_id == selection.replica_id && c.selection_id == selection.selection.id); + let is_shown = editor.show_cursor_names || editor.hovered_cursor.as_ref().is_some_and(|c| c.replica_id == selection.replica_id && c.selection_id == selection.selection.id); remote_selections .entry(selection.replica_id)