From 443301d4c879780df3fde1fa07237d5ff200a230 Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Fri, 13 Mar 2026 15:47:10 +0100 Subject: [PATCH 1/2] Incorrect Colors in LTK Refactoring Preview Wizard Change left/right diff elements in refactoring wizard to get proper diff coloring. This would make the "diff order" consistent with the **current** Eclipse diff order, which is, let say, "unusual" for a very long time (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=213780). That is also the reason the refactoring wizard had always "swapped" the input sides, being inconsistent to provide expected usability. However the coloring can be consistent only if the diff order is default one, and since diff coloring was added, refactoring wizard "hack" became visible. See also https://github.com/eclipse-platform/eclipse.platform.ui/issues/3776. This PR depends on https://github.com/eclipse-platform/eclipse.platform/pull/2566 to avoid unexpected change of the "usual" diff order in the refactoring wizard. Fixes https://github.com/eclipse-platform/eclipse.platform.ui/issues/3775 --- .../ui/refactoring/TextEditChangePreviewViewer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextEditChangePreviewViewer.java b/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextEditChangePreviewViewer.java index 90548f7a92b0..82e2e7143834 100644 --- a/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextEditChangePreviewViewer.java +++ b/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextEditChangePreviewViewer.java @@ -76,10 +76,10 @@ private static class ComparePreviewer extends CompareViewerSwitchingPane { public ComparePreviewer(Composite parent) { super(parent, SWT.BORDER | SWT.FLAT, true); fCompareConfiguration= new CompareConfiguration(); - fCompareConfiguration.setLeftEditable(false); - fCompareConfiguration.setLeftLabel(RefactoringUIMessages.ComparePreviewer_original_source); fCompareConfiguration.setRightEditable(false); - fCompareConfiguration.setRightLabel(RefactoringUIMessages.ComparePreviewer_refactored_source); + fCompareConfiguration.setRightLabel(RefactoringUIMessages.ComparePreviewer_original_source); + fCompareConfiguration.setLeftEditable(false); + fCompareConfiguration.setLeftLabel(RefactoringUIMessages.ComparePreviewer_refactored_source); addDisposeListener(e -> { if (fImage != null && !fImage.isDisposed()) { fImage.dispose(); @@ -253,7 +253,7 @@ private void setInput(TextEditBasedChange change, String left, String right, Str } fViewer.setInput(new DiffNode( - new CompareElement(left, type, resource), - new CompareElement(right, type, resource))); + new CompareElement(right, type, resource), + new CompareElement(left, type, resource))); } } \ No newline at end of file From 7f2ea20c8e7346cbefacc99dc0a32bd607271edc Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Fri, 13 Mar 2026 14:54:28 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.40 stream --- bundles/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF b/bundles/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF index ce0e45e0d301..dea006509ad7 100644 --- a/bundles/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.ltk.ui.refactoring Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ltk.ui.refactoring; singleton:=true -Bundle-Version: 3.14.0.qualifier +Bundle-Version: 3.14.100.qualifier Bundle-Activator: org.eclipse.ltk.internal.ui.refactoring.RefactoringUIPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName