Force the usage of text viewer for php files
Change-Id: I823782ceafe53fcb104ea7197a219befd404db6f
Signed-off-by: Pascal Rapicault <pascal@rapicorp.com>
diff --git a/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/internal/ui/compare/GerritMultipleInput.java b/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/internal/ui/compare/GerritMultipleInput.java
index b252df4..7b146f0 100644
--- a/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/internal/ui/compare/GerritMultipleInput.java
+++ b/org.eclipse.egerrit.ui/src/org/eclipse/egerrit/internal/ui/compare/GerritMultipleInput.java
@@ -27,7 +27,9 @@
import org.eclipse.compare.ITypedElement;
import org.eclipse.compare.contentmergeviewer.ContentMergeViewer;
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
+import org.eclipse.compare.internal.CompareUIPlugin;
import org.eclipse.compare.internal.MergeSourceViewer;
+import org.eclipse.compare.internal.ViewerDescriptor;
import org.eclipse.compare.structuremergeviewer.DiffNode;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
@@ -538,6 +540,11 @@
//We need this so we can hook the mechanism to color the comments
public Viewer findContentViewer(Viewer oldViewer, ICompareInput input, Composite parent) {
Viewer newViewer = super.findContentViewer(oldViewer, input, parent);
+ if (newViewer.getClass().getName().contains("PhpMergeViewer")) {
+ ViewerDescriptor[] vds = CompareUIPlugin.getDefault().findContentViewerDescriptor(oldViewer, input, null);
+ setContentViewerDescriptor(vds[vds.length - 1]);
+ newViewer = super.findContentViewer(oldViewer, input, parent);
+ }
purgeCache();
//Force a reset of the documents before they get used. This is necessary if the document has already been opened.
