Merge pull request #595 from FStolte/issue463

[eclipse/xtext-eclipse#463] Fixed faulty editor binding
This commit is contained in:
Karsten Thoms 2017-12-21 11:50:53 +01:00 committed by GitHub
commit 89bcbd0762
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -210,7 +210,7 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
.addTypeToType('org.eclipse.xtext.xbase.ui.quickfix.JavaTypeQuickfixes'.typeRef,
'org.eclipse.xtext.xbase.ui.quickfix.JavaTypeQuickfixesNoImportSection'.typeRef)
}
bindingFactory.addTypeToType(grammar.eclipsePluginXbaseEditor, grammar.eclipsePluginEditor)
bindingFactory.addTypeToType(grammar.eclipsePluginDefaultEditor, grammar.eclipsePluginEditor)
bindingFactory.contributeTo(language.eclipsePluginGenModule)

View file

@ -299,7 +299,7 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment {
bindingFactory.addTypeToType(TypeReference.typeRef("org.eclipse.xtext.xbase.ui.quickfix.JavaTypeQuickfixes"),
TypeReference.typeRef("org.eclipse.xtext.xbase.ui.quickfix.JavaTypeQuickfixesNoImportSection"));
}
bindingFactory.addTypeToType(this._xtextGeneratorNaming.getEclipsePluginXbaseEditor(this.getGrammar()), this._xtextGeneratorNaming.getEclipsePluginEditor(this.getGrammar()));
bindingFactory.addTypeToType(this._xtextGeneratorNaming.getEclipsePluginDefaultEditor(this.getGrammar()), this._xtextGeneratorNaming.getEclipsePluginEditor(this.getGrammar()));
bindingFactory.contributeTo(this.getLanguage().getEclipsePluginGenModule());
boolean _inheritsXbaseWithAnnotations = this._xbaseUsageDetector.inheritsXbaseWithAnnotations(this.getLanguage().getGrammar());
if (_inheritsXbaseWithAnnotations) {