From 07d38dd13be898d8036d9d84475dc06763b6a424 Mon Sep 17 00:00:00 2001 From: Moritz Eysholdt Date: Thu, 11 Aug 2016 15:33:18 +0200 Subject: [PATCH] bugfix: binding for partial content assist is IDE, not UI Signed-off-by: Moritz Eysholdt --- .../parser/antlr/XtextAntlrGeneratorFragment2.xtend | 12 ++++++------ .../parser/antlr/XtextAntlrGeneratorFragment2.java | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend index 86131bf16..941237771 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend @@ -489,6 +489,12 @@ class XtextAntlrGeneratorFragment2 extends AbstractAntlrGeneratorFragment2 { .to(«grammar.lexerClass».class); ''') .addTypeToType('org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser'.typeRef, grammar.parserClass) + if (partialParsing) { + rtBindings.addTypeToType( + "org.eclipse.xtext.ide.editor.contentassist.antlr.ContentAssistContextFactory".typeRef, + "org.eclipse.xtext.ide.editor.contentassist.antlr.PartialContentAssistContextFactory".typeRef + ) + } rtBindings.contributeTo(language.ideGenModule) } @@ -539,12 +545,6 @@ class XtextAntlrGeneratorFragment2 extends AbstractAntlrGeneratorFragment2 { .addConfiguredBinding("ContentAssistLexerProvider", ''' binder.bind(«caLexerClass».class).toProvider(«LexerProvider».create(«caLexerClass».class)); ''') - if (partialParsing) { - uiBindings.addTypeToType( - "org.eclipse.xtext.ide.editor.contentassist.antlr.ContentAssistContextFactory".typeRef, - "org.eclipse.xtext.ide.editor.contentassist.antlr.PartialContentAssistContextFactory".typeRef - ) - } uiBindings.contributeTo(language.eclipsePluginGenModule) } diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.java index 060ab3186..7d2c43bf3 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.java @@ -1487,6 +1487,11 @@ public class XtextAntlrGeneratorFragment2 extends AbstractAntlrGeneratorFragment Grammar _grammar = this.getGrammar(); TypeReference _parserClass = naming.getParserClass(_grammar); final GuiceModuleAccess.BindingFactory rtBindings = _addConfiguredBinding.addTypeToType(_typeRef, _parserClass); + if (this.partialParsing) { + TypeReference _typeRef_1 = TypeReference.typeRef("org.eclipse.xtext.ide.editor.contentassist.antlr.ContentAssistContextFactory"); + TypeReference _typeRef_2 = TypeReference.typeRef("org.eclipse.xtext.ide.editor.contentassist.antlr.PartialContentAssistContextFactory"); + rtBindings.addTypeToType(_typeRef_1, _typeRef_2); + } IXtextGeneratorLanguage _language = this.getLanguage(); GuiceModuleAccess _ideGenModule = _language.getIdeGenModule(); rtBindings.contributeTo(_ideGenModule); @@ -1616,11 +1621,6 @@ public class XtextAntlrGeneratorFragment2 extends AbstractAntlrGeneratorFragment } }; final GuiceModuleAccess.BindingFactory uiBindings = _addTypeToType_2.addConfiguredBinding("ContentAssistLexerProvider", _client_3); - if (this.partialParsing) { - TypeReference _typeRef_4 = TypeReference.typeRef("org.eclipse.xtext.ide.editor.contentassist.antlr.ContentAssistContextFactory"); - TypeReference _typeRef_5 = TypeReference.typeRef("org.eclipse.xtext.ide.editor.contentassist.antlr.PartialContentAssistContextFactory"); - uiBindings.addTypeToType(_typeRef_4, _typeRef_5); - } IXtextGeneratorLanguage _language = this.getLanguage(); GuiceModuleAccess _eclipsePluginGenModule = _language.getEclipsePluginGenModule(); uiBindings.contributeTo(_eclipsePluginGenModule);