sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 16:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add contentTypeBinding to content[Merge]Viewers

Browse source 
Fixes #542

Signed-off-by: Julian Dax <jdax@itemis.com>
This commit is contained in:
Julian Dax 2017-11-15 10:59:45 +01:00
parent 827be6cc3a
commit a7bf8945b2
No known key found for this signature in database
GPG key ID: 993523D54B866C4D
2 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend
View file

@ -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"

38
org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.java
View file

@ -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");