Fold unchanged regions in the unified diff#2791
Draft
vogella wants to merge 1 commit into
Draft
Conversation
Contributor
Author
|
This is a draft so that @tobiasmelcher can join in if he wants. Current state: Folding works but I have no way to unfold. 
|
Add a foldUnchanged(contextLines) option to UnifiedDiff that collapses the unchanged gaps between changes, keeping a few context lines around each change, similar to the unified view on GitHub. It reuses the editor's projection (folding) model, so it is a no-op when folding is disabled, and its folds are tagged so they can be removed without touching the editor's own folds. Each collapsed region shows a clickable "Expand n unchanged lines" code mining that expands it in place. Enabled with three context lines on both unified diff paths.
vogella
force-pushed
the
unified-diff-fold-unchanged
branch
from
9ab3ed5 to
b50fcaf
Compare
Contributor
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.
This adds folding of unchanged regions to the experimental unified diff overlay, similar to the collapsed unchanged sections in GitHub's diff view.
A new
UnifiedDiff.Builder#foldUnchanged(contextLines)option collapses the unchanged gaps between the displayed changes, keeping a few context lines visible around each change; it is enabled with three context lines on both unified diff paths.Each collapsed region shows a clickable "Expand n unchanged lines" code mining that expands it in place; re-collapsing via the folding ruler brings the expander back.
The implementation reuses the editor's projection (folding) model, so it is a no-op when folding is disabled, and the folds are tagged with a marker annotation so they can be removed on overlay teardown (Hide All Diffs, switching to the 2-way editor, dismissing the last diff) without touching the editor's own structural folds.
This makes reviewing large files with few changes considerably more compact.
Part of eclipse-platform/eclipse.platform.ui#3771