git: More rigorously test excerpt syncing for split diff, and fix a couple of bugs (#49907) (cherry-pick to stable)#50174
Merged
zed-zippy[bot] merged 1 commit intov0.225.xfrom Feb 26, 2026
Conversation
…ouple of bugs (#49907) This PR adds a more rigorous test for the excerpt syncing logic in `SplittableEditor`, in preparation for refactoring that code, since we've had some bugs there. The new test covers - edits within the RHS multibuffer - edits to the individual main buffers, not necessarily within the excerpt bounds of the split diff - excerpt expansion - excerpt removal - excerpt recalculation based on diff hunk ranges Bugs fixed: - incorrect edit merging logic in `patches_for_range` - `merge_excerpts` leaving stale excerpt IDs in `excerpts_by_path` Before you mark this PR as ready for review, make sure that you have: - [x] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - N/A
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
1 participant
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.
Cherry-pick of #49907 to stable
This PR adds a more rigorous test for the excerpt syncing logic in
SplittableEditor, in preparation for refactoring that code, sincewe've had some bugs there.
The new test covers
excerpt bounds of the split diff
Bugs fixed:
patches_for_rangemerge_excerptsleaving stale excerpt IDs inexcerpts_by_pathBefore you mark this PR as ready for review, make sure that you have:
testing
aspects
checklist
Release Notes: