-
Notifications
You must be signed in to change notification settings - Fork 6.3k
git: Rework side-by-side diff to use distinct buffers for the left-hand side #44838
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
cole-miller
wants to merge
30
commits into
main
Choose a base branch
from
side-by-side-diff-without-filtering
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+2,356
−2,012
Conversation
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
Co-authored-by: cameron <[email protected]>
Co-authored-by: HactarCE <[email protected]> Co-authored-by: Miguel Raz Guzmán Macedo <[email protected]>
Co-authored-by: Anthony <[email protected]> Co-authored-by: cameron <[email protected]>
Co-authored-by: Cameron <[email protected]>
Co-authored-by: cameron <[email protected]>
Co-authored-by: cameron <[email protected]>
Co-authored-by: cameron <[email protected]>
Co-authored-by: cameron <[email protected]>
Co-authored-by: cameron <[email protected]>
Co-authored-by: cameron <[email protected]>
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.
This PR reworks the (still feature-gated) side-by-side diff view to use a different approach to representing the multibuffers on the left- and right-hand sides.
Previously, these two multibuffers used identical sets of buffers and excerpts, and were made to behave differently by adding a new knob to the multibuffer controlling how diffs are displayed. Specifically, the left-hand side multibuffer would filter out the added range of each hunk from the excerpts using a new
FilteredInsertedHunkdiff transform, and the right-hand side would simply not show the deleted sides of expanded hunks. This approach has some problems:In this PR, we've switched to using independent buffers to build the left-hand side. These buffers are constructed using the base texts for the corresponding diffs, and their lifecycle is managed by
BufferDiff. The red "deleted" regions on the left-hand side are represented byBufferContentdiff transforms, notDeletedHunktransforms. This means each excerpt on the left represents a contiguous slice of a single buffer, which fixes the above issues by construction.The tradeoff with this new approach is that we now have to manually synchronize excerpt ranges from the right side to the left, which we do using
BufferDiffSnapshot::row_to_base_text_row.Release Notes: