mirror of
https://github.com/zed-industries/zed.git
synced 2026-04-18 07:47:53 +00:00
Xin Zhao
adfcb45abe
## Context Closes #46698 This PR fixes a bug where the `cs` (change surrounds) operator fails on symmetric delimiters like quotes. In a sequence like `c s ' "`, Zed previously performed two independent searches. For a line like `I'm 'goˇod'`, the first step (`cs'`) correctly moves the cursor to the second quote: `I'm ˇ'good'`. However, when the replacement character `"` is pressed, `change_surrounds` would perform another scan from the new cursor position. Because quotes are symmetric, this second search would incorrectly match `'m '` as the target pair, leading to a broken result like `I"m "good'`. I've refactored the workflow to ensure the search happens only once. `prepare_and_move_to_valid_bracket_pair` now computes and stores the `Anchor` positions of the detected pair directly into the operator state. `change_surrounds` then simply reuses these anchors instead of re-executing the search. This ensures correctness for quotes while remaining consistent with Vim/Neovim cursor behavior. While this slightly increases coupling between these two functions, it is an intentional trade-off since they exclusively serve the `cs` operation. ## How to Review The main changes are in `crates/vim/src/surrounds.rs`. I renamed `check_and_move_to_valid_bracket_pair` to `prepare_and_move_to_valid_bracket_pair` and updated it to return the detected bracket anchors. In `change_surrounds`, I removed the redundant search logic and updated it to perform the replacement using the provided anchors. You can also see the updated `Operator::ChangeSurrounds` enum variant in `crates/vim/src/state.rs` which now carries the anchor data. ## Self-Review Checklist <!-- Check before requesting review: --> - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed an issue where the `cs` Vim operator incorrectly identified symmetric quotes in certain contexts. --------- Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Zed
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:
- Web (tracking issue)
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
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 specifiederror for a crate you've created? If so, addpublish = falseunder[package]in your crate's Cargo.toml. - Is the error
failed to satisfy license requirementsfor 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 theacceptedarray inscript/licenses/zed-licenses.toml. - Is
cargo-aboutunable to find the license for a dependency? If so, add a clarification field at the end ofscript/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.