Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
editor: Use visible cursor position for rename (#55542)
sunwukk990b30ef390e13f
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rsindex 1be65d476b8..9437b8899b7 100644--- a/crates/editor/src/editor.rs+++ b/crates/editor/src/editor.rs@@ -3039,6 +3039,35 @@ impl Editor {self.cursor_offset_on_selection = set_cursor_offset_on_selection;}+ /// Returns the anchor to use as the rename target for a selection.+ ///+ /// In selection-based modes, like vim's visual mode and helix, the rendered+ /// block cursor sits one position to the left of the selection's head,+ /// since the head is the exclusive end of a forward selection. Using the+ /// head+ /// directly would place the rename one character past the symbol, for+ /// example, trailing whitespace, so for a non-empty forward selection we+ /// shift one point left to land back on the symbol under the cursor.+ fn rename_target_anchor(&self, selection: &Selection<Anchor>, cx: &mut App) -> Anchor {+ let head = selection.head();++ if self.cursor_offset_on_selection+ && !selection.reversed+ && selection.start != selection.end+ {+ let display_map = self.display_snapshot(cx);+ let display_head = head.to_display_point(&display_map);++ if display_head.column() > 0 {+ return display_map.display_point_to_anchor(+ movement::left(&display_map, display_head),+ Bias::Left,+ );+ }+ }+ head+ }+pub fn set_current_line_highlight(&mut self,current_line_highlight: Option<CurrentLineHighlight>,@@ -7632,10 +7661,9 @@ impl Editor {}let provider = self.semantics_provider.clone()?;let selection = self.selections.newest_anchor().clone();- let (cursor_buffer, cursor_buffer_position) = self- .buffer- .read(cx)- .text_anchor_for_position(selection.head(), cx)?;+ let cursor = self.rename_target_anchor(&selection, cx);+ let (cursor_buffer, cursor_buffer_position) =+ self.buffer.read(cx).text_anchor_for_position(cursor, cx)?;let (tail_buffer, cursor_buffer_position_end) = self.buffer.read(cx)@@ -7663,7 +7691,7 @@ impl Editor {this.take_rename(false, window, cx);let buffer = this.buffer.read(cx).read(cx);- let cursor_offset = selection.head().to_offset(&buffer);+ let cursor_offset = cursor.to_offset(&buffer);let rename_start =cursor_offset.saturating_sub_usize(cursor_offset_in_rename_range);let rename_end = rename_start + rename_buffer_range.len();diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rsindex 092db5fe754..2642221b31c 100644--- a/crates/vim/src/helix.rs+++ b/crates/vim/src/helix.rs@@ -1759,6 +1759,7 @@ struct HelixJumpUiData {#[cfg(test)]mod test {+ use futures::StreamExt;use std::{fmt::Write, time::Duration};use editor::{HighlightKey, MultiBufferOffset};@@ -4304,4 +4305,53 @@ mod test {);assert_eq!(cx.active_operator(), None);}++ #[gpui::test]+ async fn test_helix_rename_uses_visible_cursor_position(cx: &mut gpui::TestAppContext) {+ let mut cx = VimTestContext::new_typescript(cx).await;+ cx.enable_helix();++ cx.set_state(+ "const before = 2; console.log(«beforeˇ»)",+ Mode::HelixNormal,+ );++ let expected_position = cx.to_lsp(MultiBufferOffset(+ "const before = 2; console.log(befor".len(),+ ));+ let def_range = cx.lsp_range("const «beforeˇ» = 2; console.log(before)");+ let tgt_range = cx.lsp_range("const before = 2; console.log(«beforeˇ»)");+ let mut prepare_request = cx+ .set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(+ move |_, params, _| async move {+ assert_eq!(params.position, expected_position);+ Ok(Some(lsp::PrepareRenameResponse::Range(def_range)))+ },+ );+ let mut rename_request = cx.set_request_handler::<lsp::request::Rename, _, _>(+ move |url, params, _| async move {+ Ok(Some(lsp::WorkspaceEdit {+ changes: Some(+ [(+ url.clone(),+ vec![+ lsp::TextEdit::new(def_range, params.new_name.clone()),+ lsp::TextEdit::new(tgt_range, params.new_name),+ ],+ )]+ .into(),+ ),+ ..Default::default()+ }))+ },+ );++ cx.simulate_keystrokes("space r");+ prepare_request.next().await.unwrap();+ cx.simulate_input("after");+ cx.simulate_keystrokes("enter");+ rename_request.next().await.unwrap();++ cx.assert_state("const after = 2; console.log(afterˇ)", Mode::HelixNormal);+ }}diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rsindex fed30f8dea8..c426127dc07 100644--- a/crates/vim/src/test.rs+++ b/crates/vim/src/test.rs@@ -1258,6 +1258,49 @@ async fn test_rename(cx: &mut gpui::TestAppContext) {cx.assert_state("const afterˇ = 2; console.log(after)", Mode::Normal)}+#[gpui::test]+async fn test_visual_rename_uses_visible_cursor_position(cx: &mut gpui::TestAppContext) {+ let mut cx = VimTestContext::new_typescript(cx).await;++ cx.set_state("const before = 2; console.log(«beforeˇ»)", Mode::Visual);++ let expected_position = cx.to_lsp(MultiBufferOffset(+ "const before = 2; console.log(befor".len(),+ ));+ let def_range = cx.lsp_range("const «beforeˇ» = 2; console.log(before)");+ let tgt_range = cx.lsp_range("const before = 2; console.log(«beforeˇ»)");+ let mut prepare_request = cx.set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(+ move |_, params, _| async move {+ assert_eq!(params.position, expected_position);+ Ok(Some(lsp::PrepareRenameResponse::Range(def_range)))+ },+ );+ let mut rename_request =+ cx.set_request_handler::<lsp::request::Rename, _, _>(move |url, params, _| async move {+ Ok(Some(lsp::WorkspaceEdit {+ changes: Some(+ [(+ url.clone(),+ vec![+ lsp::TextEdit::new(def_range, params.new_name.clone()),+ lsp::TextEdit::new(tgt_range, params.new_name),+ ],+ )]+ .into(),+ ),+ ..Default::default()+ }))+ });++ cx.simulate_keystrokes("g r n");+ prepare_request.next().await.unwrap();+ cx.simulate_input("after");+ cx.simulate_keystrokes("enter");+ rename_request.next().await.unwrap();++ cx.assert_state("const after = 2; console.log(afterˇ)", Mode::Visual);+}+#[gpui::test]async fn test_go_to_definition(cx: &mut gpui::TestAppContext) {let mut cx = VimTestContext::new_typescript(cx).await;