Jace 6b985a8b26 vim: Fix Helix surround add crashing on adjacent selections (#66107)
## Summary

Closes #65718

Reproduction, Helix mode:

1. Type `abcd` in a buffer.
2. Press `x` to select the line.
3. Press `s`, enable regex, enter `\w`.
   Each character is now its own selection.
4. Press `m s "`.

Result: Zed panics with `cannot seek backward` in `text.rs`.

Cause: #59201 changed `m s` to select the surrounded text together with
the new delimiters.
It uses anchors taken before the edit:
`anchor_before(start)..anchor_after(end)`.
When two selections touch, the edit inserts the closing `"` of the first
selection and the opening `"` of the second selection at the same
offset.
`anchor_after(end)` of the first selection resolves after both.
The two selections now overlap.
Resolving overlapping anchors fails the ordering check.

Fix: each edge of a new `m s` selection records anchors on both sides of
its pre-edit offset, plus the length of the text requested at that
insertion point before the edge.
After the edit, the edge moves forward by that length, but never past
the text actually inserted between its anchors.
This keeps adjacent selections apart, and keeps ranges valid when an
insertion does not land: the editor is read-only, or an excerpt ends at
the insertion point.
Requested lengths are counted per source buffer position, because
offsets on both sides of an excerpt boundary can map to the same
position, and the multi buffer coalesces their insertions.
`m r` and `m d` still use plain anchors.

## Testing

- `test_helix_surround_add_adjacent_selections` and
`test_helix_surround_add_adjacent_across_deleted_hunk` panic on `main`
without the fix.
- `test_helix_surround_add_read_only`,
`test_helix_surround_add_at_excerpt_end`, and
`test_helix_surround_add_between_excerpts` cover the cases found in
review: a selection past the buffer end, and a closing delimiter left
outside the selection.

`cargo test -p vim --lib helix::surround` and `cargo clippy -p vim
--all-targets --all-features -- --deny warnings` pass.

Manually tested on macOS with a dev build.
The reproduction above gives `"a""b""c""d"` with four selections, one
per character.
No panic.

## Self-review

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

Release Notes:

- Fixed a crash when adding surrounding characters (`m s`) to adjacent
selections in Helix mode.

---------

Co-authored-by: Kirill Bulatov <mail4score@gmail.com>
2026-10-26 22:16:23 +00:00
2026-10-26 13:46:57 +00:00
…
2026-10-26 11:20:07 +00:00
2026-10-26 11:20:07 +00:00
…
…
2026-10-26 15:39:02 +00:00
2026-10-26 15:39:02 +00:00
…
2026-10-26 10:10:32 +00:00
…
…
…
…
…

Zed

Zed CI

Welcome to Zed, a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.


Installation

On macOS, Linux, and Windows you can download Zed directly or install Zed via your local package manager (macOS/Linux/Windows).

Other platforms are not yet available:

Developing Zed

Contributing

See CONTRIBUTING.md for ways you can contribute to Zed.

Also... we're hiring! Check out our jobs page for open roles.

Licensing

Zed source code is licensed primarily under GPL-3.0-or-later, with Apache-2.0 components where marked.

License information for third party dependencies must be correctly provided for CI to pass.

We use cargo-about to automatically comply with open source licenses. If CI is failing, check the following:

  • Is it showing a no license specified error for a crate you've created? If so, add publish = false under [package] in your crate's Cargo.toml.
  • Is the error failed to satisfy license requirements for a dependency? If so, first determine what license the project has and whether this system is sufficient to comply with this license's requirements. If you're unsure, ask a lawyer. Once you've verified that this system is acceptable add the license's SPDX identifier to the accepted array in script/licenses/zed-licenses.toml.
  • Is cargo-about unable to find the license for a dependency? If so, add a clarification field at the end of script/licenses/zed-licenses.toml, as specified in the cargo-about book.

Sponsorship

Zed is developed by Zed Industries, Inc., a for-profit company.

If you’d like to financially support the project, you can do so via GitHub Sponsors. Sponsorships go directly to Zed Industries and are used as general company revenue. There are no perks or entitlements associated with sponsorship.

S
Description
No description provided
Readme 1.6 GiB
Languages
Rust 95.4%
JSON-with-Comments 2.4%
Python 0.8%
Inno Setup 0.3%
Tree-sitter Query 0.3%
Other 0.4%