From a7bf8945b2caf74b39c651f6b6af3a65dcc9d9df Mon Sep 17 00:00:00 2001
From: Julian Dax <jdax@itemis.com>
Date: Wed, 15 Nov 2017 10:59:45 +0100
Subject: [PATCH] Add contentTypeBinding to content[Merge]Viewers

Fixes #542

Signed-off-by: Julian Dax <jdax@itemis.com>
---
 .../ui/compare/CompareFragment2.xtend         |  6 +++
 .../ui/compare/CompareFragment2.java          | 38 +++++++++++++++++--
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend
index a44199430..57c0d2752 100644
--- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend
+++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend
@@ -48,12 +48,18 @@ class CompareFragment2 extends AbstractXtextGeneratorFragment {
 					class="«grammar.eclipsePluginExecutableExtensionFactory»:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
 					extensions="«language.fileExtensions.join(",")»">
 				</viewer>
+				<contentTypeBinding
+					contentTypeId="«grammar.name».contenttype"
+					contentViewerId="«grammar.name».compare.contentViewers" />
 			</extension>
 			<extension point="org.eclipse.compare.contentMergeViewers">
 				<viewer id="«grammar.name».compare.contentMergeViewers"
 					class="«grammar.eclipsePluginExecutableExtensionFactory»:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
 					extensions="«language.fileExtensions.join(",")»" label="«grammar.simpleName» Compare">
 				</viewer>
+				<contentTypeBinding
+					contentTypeId="«grammar.name».contenttype"
+					contentMergeViewerId="«grammar.name».compare.contentMergeViewers" />
 			</extension>
 			<extension point="org.eclipse.ui.editors.documentProviders">
 				<provider id="«grammar.name».editors.documentProviders"
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.java
index e99c44133..d6f67ae1b 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.java
@@ -103,14 +103,29 @@ public class CompareFragment2 extends AbstractXtextGeneratorFragment {
       _builder.append("\t");
       _builder.append("</viewer>");
       _builder.newLine();
+      _builder.append("\t");
+      _builder.append("<contentTypeBinding");
+      _builder.newLine();
+      _builder.append("\t\t");
+      _builder.append("contentTypeId=\"");
+      String _name_1 = this.getGrammar().getName();
+      _builder.append(_name_1, "\t\t");
+      _builder.append(".contenttype\"");
+      _builder.newLineIfNotEmpty();
+      _builder.append("\t\t");
+      _builder.append("contentViewerId=\"");
+      String _name_2 = this.getGrammar().getName();
+      _builder.append(_name_2, "\t\t");
+      _builder.append(".compare.contentViewers\" />");
+      _builder.newLineIfNotEmpty();
       _builder.append("</extension>");
       _builder.newLine();
       _builder.append("<extension point=\"org.eclipse.compare.contentMergeViewers\">");
       _builder.newLine();
       _builder.append("\t");
       _builder.append("<viewer id=\"");
-      String _name_1 = this.getGrammar().getName();
-      _builder.append(_name_1, "\t");
+      String _name_3 = this.getGrammar().getName();
+      _builder.append(_name_3, "\t");
       _builder.append(".compare.contentMergeViewers\"");
       _builder.newLineIfNotEmpty();
       _builder.append("\t\t");
@@ -131,14 +146,29 @@ public class CompareFragment2 extends AbstractXtextGeneratorFragment {
       _builder.append("\t");
       _builder.append("</viewer>");
       _builder.newLine();
+      _builder.append("\t");
+      _builder.append("<contentTypeBinding");
+      _builder.newLine();
+      _builder.append("\t\t");
+      _builder.append("contentTypeId=\"");
+      String _name_4 = this.getGrammar().getName();
+      _builder.append(_name_4, "\t\t");
+      _builder.append(".contenttype\"");
+      _builder.newLineIfNotEmpty();
+      _builder.append("\t\t");
+      _builder.append("contentMergeViewerId=\"");
+      String _name_5 = this.getGrammar().getName();
+      _builder.append(_name_5, "\t\t");
+      _builder.append(".compare.contentMergeViewers\" />");
+      _builder.newLineIfNotEmpty();
       _builder.append("</extension>");
       _builder.newLine();
       _builder.append("<extension point=\"org.eclipse.ui.editors.documentProviders\">");
       _builder.newLine();
       _builder.append("\t");
       _builder.append("<provider id=\"");
-      String _name_2 = this.getGrammar().getName();
-      _builder.append(_name_2, "\t");
+      String _name_6 = this.getGrammar().getName();
+      _builder.append(_name_6, "\t");
       _builder.append(".editors.documentProviders\"");
       _builder.newLineIfNotEmpty();
       _builder.append("\t\t");