From a65a8bea431c53f4cc8ef332ea0a92042562c4c1 Mon Sep 17 00:00:00 2001 From: David Kleingeld Date: Mon, 6 Oct 2025 19:06:35 +0200 Subject: [PATCH] Revert YankEndOfLine default (part of PR #39143) (#39626) Release Notes: - N/A --- assets/keymaps/vim.json | 4 ++-- crates/vim/src/normal.rs | 8 -------- crates/vim/test_data/test_yank_to_end_of_line.json | 4 ---- 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 crates/vim/test_data/test_yank_to_end_of_line.json diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json index ae6bc8391e30e1bc61622e23e9f3aad773f4f1a7..4d296667ff572a644d4f6b37e1704c0b250a652c 100644 --- a/assets/keymaps/vim.json +++ b/assets/keymaps/vim.json @@ -240,7 +240,7 @@ "delete": "vim::DeleteRight", "g shift-j": "vim::JoinLinesNoWhitespace", "y": "vim::PushYank", - "shift-y": "vim::YankToEndOfLine", + "shift-y": "vim::YankLine", "x": "vim::DeleteRight", "shift-x": "vim::DeleteLeft", "ctrl-a": "vim::Increment", @@ -393,7 +393,7 @@ "escape": "editor::Cancel", "shift-d": "vim::DeleteToEndOfLine", "shift-j": "vim::JoinLines", - "shift-y": "vim::YankToEndOfLine", + "shift-y": "vim::YankLine", "shift-i": "vim::InsertFirstNonWhitespace", "shift-a": "vim::InsertEndOfLine", "o": "vim::InsertLineBelow", diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs index a65b9d827f180aefbebc209feebaed5362fa149e..bf45129021de7d4c4c0aa003bc05681f1622359a 100644 --- a/crates/vim/src/normal.rs +++ b/crates/vim/src/normal.rs @@ -2000,14 +2000,6 @@ mod test { cx.shared_state().await.assert_eq("// hello\n// ˇ\n// x\n"); } - #[gpui::test] - async fn test_yank_to_end_of_line(cx: &mut gpui::TestAppContext) { - let mut cx = NeovimBackedTestContext::new(cx).await; - cx.set_shared_state("heˇllo\n").await; - cx.simulate_shared_keystrokes("Y p").await; - cx.shared_state().await.assert_eq("helllˇolo\n"); - } - #[gpui::test] async fn test_yank_line_with_trailing_newline(cx: &mut gpui::TestAppContext) { let mut cx = NeovimBackedTestContext::new(cx).await; diff --git a/crates/vim/test_data/test_yank_to_end_of_line.json b/crates/vim/test_data/test_yank_to_end_of_line.json deleted file mode 100644 index 8ad09ec0f11bc31081e9b055944a4c40f8c0ca9b..0000000000000000000000000000000000000000 --- a/crates/vim/test_data/test_yank_to_end_of_line.json +++ /dev/null @@ -1,4 +0,0 @@ -{"Put":{"state":"heˇllo\n"}} -{"Key":"Y"} -{"Key":"p"} -{"Get":{"state":"helllˇolo\n","mode":"Normal"}}