Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2015-08-19 22:03:29 +0000
committerPascal Rapicault2015-09-02 19:46:06 +0000
commite1ecbb6bdbe5d9d8d58d9eaaa16a79d609a6b30c (patch)
tree080b1ef452d76f2ae4745bb02e18db7c86b383f2 /bundles/org.eclipse.compare/compare
parent7d572cec4c7ccc179d0c13ef44998a8d746148cb (diff)
downloadeclipse.platform.team-e1ecbb6bdbe5d9d8d58d9eaaa16a79d609a6b30c.tar.gz
eclipse.platform.team-e1ecbb6bdbe5d9d8d58d9eaaa16a79d609a6b30c.tar.xz
eclipse.platform.team-e1ecbb6bdbe5d9d8d58d9eaaa16a79d609a6b30c.zip
Bug 475427 - [compare] No syntax highlighting when IDocument is passed
in as input Change-Id: If494d46cf5a4ff969976db649d85665e13d10d19 Signed-off-by: Pascal Rapicault <pascal@rapicorp.com>
Diffstat (limited to 'bundles/org.eclipse.compare/compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index de96fc66b..6d0612521 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -684,6 +684,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
} else if (fElement instanceof IDocument) {
newDocument= (IDocument) fElement;
+ setupDocument(newDocument);
} else if (fElement instanceof IStreamContentAccessor) {
newDocument= DocumentManager.get(fElement);

Back to the top