Files
zed/crates/vim
Parker Loflin 7b5cc722a1 vim: Fix substitute without the g flag replacing the wrong matches (#67015)
## Summary

`SearchQuery::search` searches a slice of the buffer and returns offsets
into that slice. With `one_match_per_line`, it found each match's row by
passing the slice offset to `buffer.offset_to_point`, which takes a
buffer offset. When the slice started after the first line, matches got
the rows of lines nearer the top of the buffer, so the wrong matches
were kept. It now adds `range_offset`.

Only Vim's `:s` sets `one_match_per_line`, when it replaces the first
match on each line. It searches only the lines in its range, so it was
correct only when the range started on the first line. With `x` on line
1 and `aaaa` on line 2, `:s/a/b/` on line 2 gave `baba` instead of
`baaa`.

## Testing

- `test_replace_without_g_after_first_line` is new and fails without the
fix.
- `cargo test -p vim --lib` and `cargo test -p search --lib` pass.
- `cargo test -p project --features test-support --test integration
search` passes.
- `./script/clippy -p project -p vim` passes.

## Self-review

- [x] I've reviewed my diff for quality, security, reliability, and
performance.
- [x] UI changes follow the
[checklist](https://zed.dev/docs/development/ui-checklist).
- [x] Tests cover the new or changed behavior.

Release Notes:

- Fixed Vim's `:s` without the `g` flag replacing the wrong matches when
used after the first line

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
2026-11-16 16:03:37 +00:00
..
…

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.