Skip to content

Keep the unified diff on the side that is a workspace file #2845

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.

Sign up for GitHub

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

Merged
vogella merged 1 commit into from
Jul 31, 2026
Merged

Keep the unified diff on the side that is a workspace file #2845

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,14 +824,18 @@ private UnifiedDiffSource prepareUnifiedDiff(CompareEditorInput input, IProgress
|| !(right instanceof IStreamContentAccessor rightSource)) {
return null;
}
// The side that is not shown in the editor supplies the diff source, so it is
// read here instead of on the UI thread.
// The overlay needs a workspace file to sit on; an editor opened on anything
// else, a revision for example, comes up empty. The other side supplies the
// diff source and is read here rather than on the UI thread.
if (leftEditorInput instanceof IFileEditorInput) {
return new UnifiedDiffSource(compareInput, leftEditorInput, left, UnifiedDiffMode.REVERT_MODE,
getSourceOf(rightSource));
}
return new UnifiedDiffSource(compareInput, rightEditorInput, right, UnifiedDiffMode.OVERLAY_READ_ONLY_MODE,
getSourceOf(leftSource));
if (rightEditorInput instanceof IFileEditorInput) {
return new UnifiedDiffSource(compareInput, rightEditorInput, right, UnifiedDiffMode.OVERLAY_READ_ONLY_MODE,
getSourceOf(leftSource));
}
return null;
}

private static IEditorInput documentKeyOf(ITypedElement element) {
Expand Down
Loading