Fix split diff stale scroll anchor crash#58688
Merged
Anthony-Eid merged 2 commits intoJun 5, 2026
Merged
Conversation
This crash happened when the LHS of a split editor retained a stall shared anchor when unsplitting the two editors
cole-miller
approved these changes
Jun 5, 2026
Contributor
Author
|
/cherry-pick preview |
This was referenced Jun 5, 2026
zed-zippy Bot
added a commit
that referenced
this pull request
Jun 5, 2026
…ble) (#58695) Cherry-pick of #58688 to stable ---- This crash occurred when the left hand side (LHS) editor in the split diff retained a stale shared scroll handler after the split editor unsplits. I added an invariant check to our randomized companion display map tests to prevent regressions here and explicitly make LHS editor set a native scroll anchor when unsplitting. Self-Review Checklist: - [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: - Fix crash that could occur when unsplitting a side by side diff view Co-authored-by: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
zed-zippy Bot
added a commit
that referenced
this pull request
Jun 5, 2026
…view) (#58694) Cherry-pick of #58688 to preview ---- This crash occurred when the left hand side (LHS) editor in the split diff retained a stale shared scroll handler after the split editor unsplits. I added an invariant check to our randomized companion display map tests to prevent regressions here and explicitly make LHS editor set a native scroll anchor when unsplitting. Self-Review Checklist: - [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: - Fix crash that could occur when unsplitting a side by side diff view Co-authored-by: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
TomPlanche
pushed a commit
to TomPlanche/zed
that referenced
this pull request
Jun 8, 2026
This crash occurred when the left hand side (LHS) editor in the split diff retained a stale shared scroll handler after the split editor unsplits. I added an invariant check to our randomized companion display map tests to prevent regressions here and explicitly make LHS editor set a native scroll anchor when unsplitting. Self-Review Checklist: - [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: - Fix crash that could occur when unsplitting a side by side diff view
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
2 participants
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.
This crash occurred when the left hand side (LHS) editor in the split diff retained a stale shared scroll handler after the split editor unsplits. I added an invariant check to our randomized companion display map tests to prevent regressions here and explicitly make LHS editor set a native scroll anchor when unsplitting.
Self-Review Checklist:
Release Notes: