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

#127: Regenerated test languages

Browse source 
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
This commit is contained in:
Miro Spönemann 2016-10-13 15:23:04 +02:00
parent 282f734fa0
commit 3d22454111
15 changed files with 199 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
org.eclipse.xtext.ide.tests/.gitignore vendored
View file

@ -1 +1,2 @@
test-data/
.antlr-generator-*.jar

1
org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/CompletionTest.xtend
View file

@ -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]]
'''
]

24
org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/AbstractPartialContentAssistTestLanguageIdeModule.java
View file

@ -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<ExecutorService> 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<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
return AntlrProposalConflictHelper.class;
}
// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
public Class<? extends ContentAssistContextFactory> bindContentAssistContextFactory() {
return PartialContentAssistContextFactory.class;
}
// contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2
public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
return FQNPrefixMatcher.class;
}
}

24
org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/AbstractTestLanguageIdeModule.java
View file

@ -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<ExecutorService> 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<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
return AntlrProposalConflictHelper.class;
}
// contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2
public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
return FQNPrefixMatcher.class;
}
}

4
org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageRuntimeModule.xtend
View file

@ -18,11 +18,11 @@ import org.eclipse.xtext.ide.tests.testlanguage.signatureHelp.SignatureHelpServi
class TestLanguageRuntimeModule extends AbstractTestLanguageRuntimeModule {
def Class<? extends IFormatter2> bindIFormatter2() {
return TestLanguageFormatter;
return TestLanguageFormatter
}
def Class<? extends SignatureHelpService> bindSignatureHelpService() {
return SignatureHelpServiceImpl;
return SignatureHelpServiceImpl
}
}

10
org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeModule.xtend
View file

@ -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<ExecutorService> executorServiceProvider) {
super(executorServiceProvider)
}
}

6
org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeSetup.xtend
View file

@ -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))
}
}

2
org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/server/CompletionTest.java
View file

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

9
org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeModule.java
View file

@ -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<ExecutorService> executorServiceProvider) {
super(executorServiceProvider);
}
}

7
org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLanguageIdeSetup.java
View file

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

24
org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractBeeLangTestLanguageIdeModule.java
View file

@ -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<ExecutorService> 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<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
return AntlrProposalConflictHelper.class;
}
// contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2
public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
return FQNPrefixMatcher.class;
}
}

24
org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractExBeeLangTestLanguageIdeModule.java
View file

@ -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<ExecutorService> 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<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
return AntlrProposalConflictHelper.class;
}
// contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2
public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
return FQNPrefixMatcher.class;
}
}

24
org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/backtracking/ide/AbstractSimpleBeeLangTestLanguageIdeModule.java
View file

@ -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<ExecutorService> 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<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
return AntlrProposalConflictHelper.class;
}
// contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2
public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
return FQNPrefixMatcher.class;
}
}

24
org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/AbstractNoJdtTestLanguageIdeModule.java
View file

@ -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<ExecutorService> 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<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
return AntlrProposalConflictHelper.class;
}
// contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2
public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
return FQNPrefixMatcher.class;
}
}

24
org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/ide/AbstractXtextGrammarTestLanguageIdeModule.java
View file

@ -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<ExecutorService> 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<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
return AntlrProposalConflictHelper.class;
}
// contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2
public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
return FQNPrefixMatcher.class;
}
}