Use multibuffer to fix symbol search when diff is present#52268
Merged
ConradIrwin merged 1 commit intozed-industries:mainfrom Apr 6, 2026
Merged
Use multibuffer to fix symbol search when diff is present#52268ConradIrwin merged 1 commit intozed-industries:mainfrom
ConradIrwin merged 1 commit intozed-industries:mainfrom
Conversation
|
We require contributors to sign our Contributor License Agreement, and we don't have @Steven-Weng on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
Contributor
Author
|
@cla-bot check |
|
The cla-bot has been summoned, and re-checked this pull request! |
Member
|
Thanks! |
Member
|
Can you please fix the linter? |
auto-merge was automatically disabled
March 27, 2026 05:44
Head branch was pushed to by a user without write access
3a5c67e to
231ac96
Compare
Contributor
Author
|
Fixed the formatting, combined the formatting fix commit and initial commit. |
ConradIrwin
approved these changes
Apr 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Context
Fixes a bug where project symbol search navigates to the wrong position when diff hunks are expanded. The cursor would land offset by the number of lines added by the expanded diffs (Closes #51331). Now, users navigating to symbols via project symbol search will land on the correct position even when diff hunks are expanded in the editor.
The fix converts the buffer position to a
multi_buffer::Anchorbefore passing it toselect_ranges, so it resolves correctly through the diff transform layer instead of being interpreted as a literal MultiBuffer coordinate.Previously, the symbol's position was passed as a raw coordinate to the editor, which interpreted it relative to what's displayed on screen (including expanded diff lines). The fix converts the position to an anchor, which is tied to the actual content in the file rather than a screen position.
How to Review
crates/project_symbols/src/project_symbols.rs. Most of the changes are inconfirm()method (Lines 142-154).Self-Review Checklist
Release Notes: