Ibrahim Khananddino
a6020373b6
## Why / What Fixes #58702. In Helix mode the block cursor is a one-character selection that can rest on the trailing newline at the end of a line. When you select to the end of a line (excluding the newline) and press `d`, Helix leaves the cursor on the newline. Zed instead clamped the cursor onto the character immediately to the left of the deleted selection. The shared `visual_delete` always re-clipped the post-deletion cursor at line ends (`set_clip_at_line_ends(true)`), which is correct for Vim normal mode but contradicts Helix mode, where `Vim::clip_at_line_ends()` is `false`. This also made Helix inconsistent with itself: deleting a whole line left the cursor on the newline, but deleting to the end of a non-empty line clamped it onto the previous character. The fix honors the active mode's clip policy, so Helix keeps the cursor on the newline. ## Testing - Added `test_delete_to_end_of_line_keeps_cursor_on_newline` reproducing #58702. - Corrected `test_helix_select_end_of_line`; its mid-line assertion had captured the pre-fix (clamped) cursor position. Its whole-line assertion already expected the cursor on the newline, so the test is now internally consistent. - `cargo test -p vim`: 540 passed, 0 failed. - Vim visual-mode delete is unchanged (`is_helix()` is false for Vim modes). Release Notes: - Fixed Helix mode placing the cursor on the wrong character after deleting a selection that ends at the end of a line. --------- Co-authored-by: dino <dinojoaocosta@gmail.com>
This contains the code for Zed's Vim emulation mode.
Vim mode in Zed is supposed to primarily "do what you expect": it mostly tries to copy vim exactly, but will use Zed-specific functionality when available to make things smoother. This means Zed will never be 100% vim compatible, but should be 100% vim familiar!
The backlog is maintained in the #vim channel notes.
Testing against Neovim
If you are making a change to make Zed's behavior more closely match vim/nvim, you can create a test using the NeovimBackedTestContext.
For example, the following test checks that Zed and Neovim have the same behavior when running * in visual mode:
#[gpui::test]
async fn test_visual_star_hash(cx: &mut gpui::TestAppContext) {
let mut cx = NeovimBackedTestContext::new(cx).await;
cx.set_shared_state("ˇa.c. abcd a.c. abcd").await;
cx.simulate_shared_keystrokes(["v", "3", "l", "*"]).await;
cx.assert_shared_state("a.c. abcd ˇa.c. abcd").await;
}
To keep CI runs fast, by default the neovim tests use a cached JSON file that records what neovim did (see crates/vim/test_data), but while developing this test you'll need to run it with the neovim flag enabled:
cargo test -p vim --features neovim test_visual_star_hash
This will run your keystrokes against a headless neovim and cache the results in the test_data directory. Note that neovim must be installed and reachable on your $PATH in order to run the feature.
Testing zed-only behavior
Zed does more than vim/neovim in their default modes. The VimTestContext can be used instead. This lets you test integration with the language server and other parts of zed's UI that don't have a NeoVim equivalent.