Ibrahim KhanandKirill Bulatov
c6124d3525
# Objective Fixes #62278. Allow `editor: expand excerpts` from deleted text in unified diffs. ## Solution - Resolve cursor and selection ranges against the current snapshot, including deleted hunks. - Preserve half-open selection boundaries and include trailing empty excerpts at EOF. - Skip removed paths during expansion. ## Testing Regression coverage includes deleted-hunk cursors and selections, stale paths, selections ending at excerpt boundaries, and trailing empty excerpts. The boundary and EOF cases cover all three expansion directions. The Bookmarks action case uses `excerpt_context_lines: 0`. The new boundary and EOF regressions failed before the fix and passed afterward. - `cargo test --locked -p editor -p multi_buffer --lib`: 1026 editor tests and 67 multibuffer tests passed; 1 ignored. - `./script/clippy -p editor -p multi_buffer`: passed. - `cargo fmt --all -- --check`: passed. - `git diff --check origin/main..HEAD`: passed. Automated testing ran on Linux. The first full run hit a SQLite table lock in `persistence::tests::test_save_and_get_serialized_editor`. The isolated test and full rerun passed. ## Self-Review Checklist: - [x] I have reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks, if any, have justifying comments - [x] The content adheres to Zed UI standards - [x] Tests cover the new behavior - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed excerpt expansion when the selection is on deleted text in unified diffs --------- Co-authored-by: Kirill Bulatov <kirill@zed.dev>
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 discussion)
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 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.