diff --git a/org.eclipse.xtext.ide.tests/.gitignore b/org.eclipse.xtext.ide.tests/.gitignore index 6350f0fe2..9ffeaf510 100644 --- a/org.eclipse.xtext.ide.tests/.gitignore +++ b/org.eclipse.xtext.ide.tests/.gitignore @@ -1 +1,2 @@ test-data/ +.antlr-generator-*.jar diff --git a/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/CompletionTest.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/CompletionTest.xtend index 24aa40c29..a70f8fde8 100644 --- a/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/CompletionTest.xtend +++ b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/CompletionTest.xtend @@ -70,7 +70,6 @@ class CompletionTest extends AbstractTestLangLanguageServerTest { column = ' Fo'.length expectedCompletionItems = ''' Foo (TypeDeclaration) -> Foo [[1, 4] .. [1, 6]] - name (ID) -> name [[1, 6] .. [1, 6]] [ -> [ [[1, 6] .. [1, 6]] ''' ] diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/AbstractPartialContentAssistTestLanguageIdeModule.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/AbstractPartialContentAssistTestLanguageIdeModule.java index ba5617646..9f35c23e5 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/AbstractPartialContentAssistTestLanguageIdeModule.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/AbstractPartialContentAssistTestLanguageIdeModule.java @@ -8,9 +8,15 @@ package org.eclipse.xtext.ide.tests.testlanguage.ide; import com.google.inject.Binder; +import com.google.inject.Provider; import com.google.inject.name.Names; +import java.util.concurrent.ExecutorService; import org.eclipse.xtext.ide.DefaultIdeModule; import org.eclipse.xtext.ide.LexerIdeBindings; +import org.eclipse.xtext.ide.editor.contentassist.FQNPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper; +import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper; import org.eclipse.xtext.ide.editor.contentassist.antlr.ContentAssistContextFactory; import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.PartialContentAssistContextFactory; @@ -24,6 +30,14 @@ import org.eclipse.xtext.ide.tests.testlanguage.ide.contentassist.antlr.internal @SuppressWarnings("all") public abstract class AbstractPartialContentAssistTestLanguageIdeModule extends DefaultIdeModule { + public AbstractPartialContentAssistTestLanguageIdeModule() { + super(); + } + + public AbstractPartialContentAssistTestLanguageIdeModule(Provider executorServiceProvider) { + super(executorServiceProvider); + } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 public void configureContentAssistLexer(Binder binder) { binder.bind(Lexer.class) @@ -36,9 +50,19 @@ public abstract class AbstractPartialContentAssistTestLanguageIdeModule extends return PartialContentAssistTestLanguageParser.class; } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIProposalConflictHelper() { + return AntlrProposalConflictHelper.class; + } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 public Class bindContentAssistContextFactory() { return PartialContentAssistContextFactory.class; } + // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 + public Class bindIPrefixMatcher() { + return FQNPrefixMatcher.class; + } + } diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/AbstractTestLanguageIdeModule.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/AbstractTestLanguageIdeModule.java index 5414e7806..5a7ead9a4 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/AbstractTestLanguageIdeModule.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/AbstractTestLanguageIdeModule.java @@ -8,9 +8,15 @@ package org.eclipse.xtext.ide.tests.testlanguage.ide; import com.google.inject.Binder; +import com.google.inject.Provider; import com.google.inject.name.Names; +import java.util.concurrent.ExecutorService; import org.eclipse.xtext.ide.DefaultIdeModule; import org.eclipse.xtext.ide.LexerIdeBindings; +import org.eclipse.xtext.ide.editor.contentassist.FQNPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper; +import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper; import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; import org.eclipse.xtext.ide.tests.testlanguage.ide.contentassist.antlr.TestLanguageParser; @@ -22,6 +28,14 @@ import org.eclipse.xtext.ide.tests.testlanguage.ide.contentassist.antlr.internal @SuppressWarnings("all") public abstract class AbstractTestLanguageIdeModule extends DefaultIdeModule { + public AbstractTestLanguageIdeModule() { + super(); + } + + public AbstractTestLanguageIdeModule(Provider executorServiceProvider) { + super(executorServiceProvider); + } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 public void configureContentAssistLexer(Binder binder) { binder.bind(Lexer.class) @@ -34,4 +48,14 @@ public abstract class AbstractTestLanguageIdeModule extends DefaultIdeModule { return TestLanguageParser.class; } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIProposalConflictHelper() { + return AntlrProposalConflictHelper.class; + } + + // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 + public Class bindIPrefixMatcher() { + return FQNPrefixMatcher.class; + } + } diff --git a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageRuntimeModule.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageRuntimeModule.xtend index 97bc41051..e784afd1a 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageRuntimeModule.xtend +++ b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageRuntimeModule.xtend @@ -18,11 +18,11 @@ import org.eclipse.xtext.ide.tests.testlanguage.signatureHelp.SignatureHelpServi class TestLanguageRuntimeModule extends AbstractTestLanguageRuntimeModule { def Class bindIFormatter2() { - return TestLanguageFormatter; + return TestLanguageFormatter } def Class bindSignatureHelpService() { - return SignatureHelpServiceImpl; + return SignatureHelpServiceImpl } } diff --git a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeModule.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeModule.xtend index 673b52d5f..5cd0a5342 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeModule.xtend +++ b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeModule.xtend @@ -7,10 +7,20 @@ */ package org.eclipse.xtext.ide.tests.testlanguage.ide +import com.google.inject.Provider +import java.util.concurrent.ExecutorService /** * Use this class to register ide components. */ class TestLanguageIdeModule extends AbstractTestLanguageIdeModule { + + new() { + super() + } + + new(Provider executorServiceProvider) { + super(executorServiceProvider) + } } diff --git a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeSetup.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeSetup.xtend index 0f7341b80..204220e8b 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeSetup.xtend +++ b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeSetup.xtend @@ -10,13 +10,15 @@ package org.eclipse.xtext.ide.tests.testlanguage.ide import com.google.inject.Guice import org.eclipse.xtext.ide.tests.testlanguage.TestLanguageRuntimeModule import org.eclipse.xtext.ide.tests.testlanguage.TestLanguageStandaloneSetup +import org.eclipse.xtext.util.Modules2 /** - * Initialization support for running Xtext languages without Equinox extension registry. + * Initialization support for running Xtext languages as language servers. */ class TestLanguageIdeSetup extends TestLanguageStandaloneSetup { override createInjector() { - Guice.createInjector(new TestLanguageRuntimeModule, new TestLanguageIdeModule) + Guice.createInjector(Modules2.mixin(new TestLanguageRuntimeModule, new TestLanguageIdeModule)) } + } diff --git a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/server/CompletionTest.java b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/server/CompletionTest.java index 532d2834e..6fc07132a 100644 --- a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/server/CompletionTest.java +++ b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/server/CompletionTest.java @@ -97,8 +97,6 @@ public class CompletionTest extends AbstractTestLangLanguageServerTest { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("Foo (TypeDeclaration) -> Foo [[1, 4] .. [1, 6]]"); _builder_1.newLine(); - _builder_1.append("name (ID) -> name [[1, 6] .. [1, 6]]"); - _builder_1.newLine(); _builder_1.append("[ -> [ [[1, 6] .. [1, 6]]"); _builder_1.newLine(); it.setExpectedCompletionItems(_builder_1.toString()); diff --git a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeModule.java b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeModule.java index 3b19f07a5..1afdee40d 100644 --- a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeModule.java +++ b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeModule.java @@ -7,6 +7,8 @@ */ package org.eclipse.xtext.ide.tests.testlanguage.ide; +import com.google.inject.Provider; +import java.util.concurrent.ExecutorService; import org.eclipse.xtext.ide.tests.testlanguage.ide.AbstractTestLanguageIdeModule; /** @@ -14,4 +16,11 @@ import org.eclipse.xtext.ide.tests.testlanguage.ide.AbstractTestLanguageIdeModul */ @SuppressWarnings("all") public class TestLanguageIdeModule extends AbstractTestLanguageIdeModule { + public TestLanguageIdeModule() { + super(); + } + + public TestLanguageIdeModule(final Provider executorServiceProvider) { + super(executorServiceProvider); + } } diff --git a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeSetup.java b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeSetup.java index 28df4bb1e..4206dc48d 100644 --- a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeSetup.java +++ b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeSetup.java @@ -9,12 +9,14 @@ package org.eclipse.xtext.ide.tests.testlanguage.ide; import com.google.inject.Guice; import com.google.inject.Injector; +import com.google.inject.Module; import org.eclipse.xtext.ide.tests.testlanguage.TestLanguageRuntimeModule; import org.eclipse.xtext.ide.tests.testlanguage.TestLanguageStandaloneSetup; import org.eclipse.xtext.ide.tests.testlanguage.ide.TestLanguageIdeModule; +import org.eclipse.xtext.util.Modules2; /** - * Initialization support for running Xtext languages without Equinox extension registry. + * Initialization support for running Xtext languages as language servers. */ @SuppressWarnings("all") public class TestLanguageIdeSetup extends TestLanguageStandaloneSetup { @@ -22,6 +24,7 @@ public class TestLanguageIdeSetup extends TestLanguageStandaloneSetup { public Injector createInjector() { TestLanguageRuntimeModule _testLanguageRuntimeModule = new TestLanguageRuntimeModule(); TestLanguageIdeModule _testLanguageIdeModule = new TestLanguageIdeModule(); - return Guice.createInjector(_testLanguageRuntimeModule, _testLanguageIdeModule); + Module _mixin = Modules2.mixin(_testLanguageRuntimeModule, _testLanguageIdeModule); + return Guice.createInjector(_mixin); } } diff --git a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractBeeLangTestLanguageIdeModule.java b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractBeeLangTestLanguageIdeModule.java index b73a77331..73c027699 100644 --- a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractBeeLangTestLanguageIdeModule.java +++ b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractBeeLangTestLanguageIdeModule.java @@ -4,9 +4,15 @@ package org.eclipse.xtext.testlanguages.backtracking.ide; import com.google.inject.Binder; +import com.google.inject.Provider; import com.google.inject.name.Names; +import java.util.concurrent.ExecutorService; import org.eclipse.xtext.ide.DefaultIdeModule; import org.eclipse.xtext.ide.LexerIdeBindings; +import org.eclipse.xtext.ide.editor.contentassist.FQNPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper; +import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper; import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; import org.eclipse.xtext.testlanguages.backtracking.ide.contentassist.antlr.BeeLangTestLanguageParser; @@ -18,6 +24,14 @@ import org.eclipse.xtext.testlanguages.backtracking.ide.contentassist.antlr.inte @SuppressWarnings("all") public abstract class AbstractBeeLangTestLanguageIdeModule extends DefaultIdeModule { + public AbstractBeeLangTestLanguageIdeModule() { + super(); + } + + public AbstractBeeLangTestLanguageIdeModule(Provider executorServiceProvider) { + super(executorServiceProvider); + } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 public void configureContentAssistLexer(Binder binder) { binder.bind(Lexer.class) @@ -30,4 +44,14 @@ public abstract class AbstractBeeLangTestLanguageIdeModule extends DefaultIdeMod return BeeLangTestLanguageParser.class; } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIProposalConflictHelper() { + return AntlrProposalConflictHelper.class; + } + + // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 + public Class bindIPrefixMatcher() { + return FQNPrefixMatcher.class; + } + } diff --git a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractExBeeLangTestLanguageIdeModule.java b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractExBeeLangTestLanguageIdeModule.java index cae578e88..876c14e15 100644 --- a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractExBeeLangTestLanguageIdeModule.java +++ b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractExBeeLangTestLanguageIdeModule.java @@ -4,9 +4,15 @@ package org.eclipse.xtext.testlanguages.backtracking.ide; import com.google.inject.Binder; +import com.google.inject.Provider; import com.google.inject.name.Names; +import java.util.concurrent.ExecutorService; import org.eclipse.xtext.ide.DefaultIdeModule; import org.eclipse.xtext.ide.LexerIdeBindings; +import org.eclipse.xtext.ide.editor.contentassist.FQNPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper; +import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper; import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; import org.eclipse.xtext.testlanguages.backtracking.ide.contentassist.antlr.ExBeeLangTestLanguageParser; @@ -18,6 +24,14 @@ import org.eclipse.xtext.testlanguages.backtracking.ide.contentassist.antlr.lexe @SuppressWarnings("all") public abstract class AbstractExBeeLangTestLanguageIdeModule extends DefaultIdeModule { + public AbstractExBeeLangTestLanguageIdeModule() { + super(); + } + + public AbstractExBeeLangTestLanguageIdeModule(Provider executorServiceProvider) { + super(executorServiceProvider); + } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 public void configureContentAssistLexer(Binder binder) { binder.bind(Lexer.class) @@ -30,4 +44,14 @@ public abstract class AbstractExBeeLangTestLanguageIdeModule extends DefaultIdeM return ExBeeLangTestLanguageParser.class; } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIProposalConflictHelper() { + return AntlrProposalConflictHelper.class; + } + + // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 + public Class bindIPrefixMatcher() { + return FQNPrefixMatcher.class; + } + } diff --git a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractSimpleBeeLangTestLanguageIdeModule.java b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractSimpleBeeLangTestLanguageIdeModule.java index 121e8cdb1..ded746b83 100644 --- a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractSimpleBeeLangTestLanguageIdeModule.java +++ b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractSimpleBeeLangTestLanguageIdeModule.java @@ -4,9 +4,15 @@ package org.eclipse.xtext.testlanguages.backtracking.ide; import com.google.inject.Binder; +import com.google.inject.Provider; import com.google.inject.name.Names; +import java.util.concurrent.ExecutorService; import org.eclipse.xtext.ide.DefaultIdeModule; import org.eclipse.xtext.ide.LexerIdeBindings; +import org.eclipse.xtext.ide.editor.contentassist.FQNPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper; +import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper; import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; import org.eclipse.xtext.testlanguages.backtracking.ide.contentassist.antlr.SimpleBeeLangTestLanguageParser; @@ -18,6 +24,14 @@ import org.eclipse.xtext.testlanguages.backtracking.ide.contentassist.antlr.inte @SuppressWarnings("all") public abstract class AbstractSimpleBeeLangTestLanguageIdeModule extends DefaultIdeModule { + public AbstractSimpleBeeLangTestLanguageIdeModule() { + super(); + } + + public AbstractSimpleBeeLangTestLanguageIdeModule(Provider executorServiceProvider) { + super(executorServiceProvider); + } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 public void configureContentAssistLexer(Binder binder) { binder.bind(Lexer.class) @@ -30,4 +44,14 @@ public abstract class AbstractSimpleBeeLangTestLanguageIdeModule extends Default return SimpleBeeLangTestLanguageParser.class; } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIProposalConflictHelper() { + return AntlrProposalConflictHelper.class; + } + + // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 + public Class bindIPrefixMatcher() { + return FQNPrefixMatcher.class; + } + } diff --git a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/AbstractNoJdtTestLanguageIdeModule.java b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/AbstractNoJdtTestLanguageIdeModule.java index d83770809..f27001da9 100644 --- a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/AbstractNoJdtTestLanguageIdeModule.java +++ b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/AbstractNoJdtTestLanguageIdeModule.java @@ -4,9 +4,15 @@ package org.eclipse.xtext.testlanguages.noJdt.ide; import com.google.inject.Binder; +import com.google.inject.Provider; import com.google.inject.name.Names; +import java.util.concurrent.ExecutorService; import org.eclipse.xtext.ide.DefaultIdeModule; import org.eclipse.xtext.ide.LexerIdeBindings; +import org.eclipse.xtext.ide.editor.contentassist.FQNPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper; +import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper; import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; import org.eclipse.xtext.testlanguages.noJdt.ide.contentassist.antlr.NoJdtTestLanguageParser; @@ -18,6 +24,14 @@ import org.eclipse.xtext.testlanguages.noJdt.ide.contentassist.antlr.internal.In @SuppressWarnings("all") public abstract class AbstractNoJdtTestLanguageIdeModule extends DefaultIdeModule { + public AbstractNoJdtTestLanguageIdeModule() { + super(); + } + + public AbstractNoJdtTestLanguageIdeModule(Provider executorServiceProvider) { + super(executorServiceProvider); + } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 public void configureContentAssistLexer(Binder binder) { binder.bind(Lexer.class) @@ -30,4 +44,14 @@ public abstract class AbstractNoJdtTestLanguageIdeModule extends DefaultIdeModul return NoJdtTestLanguageParser.class; } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIProposalConflictHelper() { + return AntlrProposalConflictHelper.class; + } + + // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 + public Class bindIPrefixMatcher() { + return FQNPrefixMatcher.class; + } + } diff --git a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/ide/AbstractXtextGrammarTestLanguageIdeModule.java b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/ide/AbstractXtextGrammarTestLanguageIdeModule.java index c84d96282..90536a692 100644 --- a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/ide/AbstractXtextGrammarTestLanguageIdeModule.java +++ b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/ide/AbstractXtextGrammarTestLanguageIdeModule.java @@ -4,9 +4,15 @@ package org.eclipse.xtext.testlanguages.xtextgrammar.ide; import com.google.inject.Binder; +import com.google.inject.Provider; import com.google.inject.name.Names; +import java.util.concurrent.ExecutorService; import org.eclipse.xtext.ide.DefaultIdeModule; import org.eclipse.xtext.ide.LexerIdeBindings; +import org.eclipse.xtext.ide.editor.contentassist.FQNPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher; +import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper; +import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper; import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; import org.eclipse.xtext.testlanguages.xtextgrammar.ide.contentassist.antlr.XtextGrammarTestLanguageParser; @@ -18,6 +24,14 @@ import org.eclipse.xtext.testlanguages.xtextgrammar.ide.contentassist.antlr.inte @SuppressWarnings("all") public abstract class AbstractXtextGrammarTestLanguageIdeModule extends DefaultIdeModule { + public AbstractXtextGrammarTestLanguageIdeModule() { + super(); + } + + public AbstractXtextGrammarTestLanguageIdeModule(Provider executorServiceProvider) { + super(executorServiceProvider); + } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 public void configureContentAssistLexer(Binder binder) { binder.bind(Lexer.class) @@ -30,4 +44,14 @@ public abstract class AbstractXtextGrammarTestLanguageIdeModule extends DefaultI return XtextGrammarTestLanguageParser.class; } + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIProposalConflictHelper() { + return AntlrProposalConflictHelper.class; + } + + // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 + public Class bindIPrefixMatcher() { + return FQNPrefixMatcher.class; + } + }