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. 
|
vogella
force-pushed
the
unified-diff-fold-unchanged
branch
from
July 2, 2026 08:03
9ab3ed5 to
b50fcaf
Compare
Contributor
vogella
force-pushed
the
unified-diff-fold-unchanged
branch
3 times, most recently
from
July 31, 2026 09:08
a8e0a30 to
0c90f6e
Compare
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
August 4, 2026 18:43
0c90f6e to
909ab3f
Compare
There was a problem hiding this comment.
Pull request overview
This pull request adds folding of unchanged regions to the experimental unified diff overlay in the Eclipse Compare UI, making large files with sparse changes more compact by collapsing unchanged gaps while preserving configurable context around each change.
Changes:
- Introduces a new
UnifiedDiff.Builder#foldUnchanged(int contextLines)option and wires it through toUnifiedDiffManager.open(...). - Implements unchanged-region fold computation and lifecycle management using the editor projection (folding) model, including teardown of added fold annotations.
- Adds “Expand n unchanged lines” code minings for collapsed fold regions and introduces a dedicated test suite for fold-region selection logic.
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| team/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/UnifiedDiffFoldRegionsTest.java | New unit tests for computing which unchanged lines should be folded given diffs + context. |
| team/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/AllTeamUITests.java | Registers the new fold-region test in the Team UI test suite. |
| team/bundles/org.eclipse.compare/compare/org/eclipse/compare/unifieddiff/UnifiedDiff.java | Adds the foldUnchanged(int) builder option and passes it to the manager. |
| team/bundles/org.eclipse.compare/compare/org/eclipse/compare/unifieddiff/internal/UnifiedDiffManager.java | Computes unchanged fold regions, adds/removes tagged projection annotations, and updates code minings when folds change. |
| team/bundles/org.eclipse.compare/compare/org/eclipse/compare/unifieddiff/internal/UnifiedDiffCodeMiningProvider.java | Adds fold-expander code minings based on collapsed fold annotations. |
| team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java | Enables unchanged-region folding with a default of 3 context lines when opening unified diff. |
| team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties | Adds NLS message keys for the fold-expander label(s). |
| team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java | Adds corresponding NLS fields for the new expander messages. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+93
to
+97
| /** | ||
| * Collapses unchanged regions between diffs, keeping the given number of | ||
| * context lines (at least one) around each change. A negative value disables | ||
| * folding. | ||
| */ |
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.
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 where the unified diff is opened.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 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.
Still a draft for one reason: reusing the projection model means this only takes effect in editors that install projection support, such as the Java editor or the Generic Editor.
AbstractDecoratedTextEditorandTextEditordo not, so for a plain text file opened with the default text editor the option is silently a no-op. That needs a decision before this lands: accept it as a limitation, or fall back to something that does not depend on projection.Part of eclipse-platform/eclipse.platform.ui#3771