From 14e7e6b8e21a3ed8f85ab46dc9bb86e73328d095 Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Sun, 15 Nov 2015 21:12:14 +0100 Subject: [PATCH] Revert "Migration of runtime test languages" --- .../generator/idea/IdeaPluginGenerator.xtend | 178 ++---- .../model/project/RuntimeProjectConfig.xtend | 7 +- .../model/project/SubProjectConfig.xtend | 13 +- .../antlr/AbstractAntlrGrammarGenerator.xtend | 28 +- .../parser/antlr/GrammarNaming.xtend | 10 +- .../BacktrackingLexerTestLanguage.ecore | 31 - .../BacktrackingLexerTestLanguage.genmodel | 31 - .../model/generated/SubTestLanguage.ecore | 12 - .../model/generated/SubTestLanguage.genmodel | 15 - .../model/generated/SuperTestLanguage.ecore | 11 - .../generated/SuperTestLanguage.genmodel | 16 - .../generated/XtextGrammarTestLanguage.ecore | 125 ---- .../XtextGrammarTestLanguage.genmodel | 109 ---- .../xtext/GenerateAllTestLanguages2.mwe2 | 596 ------------------ .../src/org/eclipse/xtext/TestLanguage.xtend | 82 --- .../SuperTestLanguageSemanticSequencer.java | 4 + .../SuperTestLanguageSyntacticSequencer.java | 4 + 17 files changed, 75 insertions(+), 1197 deletions(-) delete mode 100644 tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.ecore delete mode 100644 tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.genmodel delete mode 100644 tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore delete mode 100644 tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel delete mode 100644 tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore delete mode 100644 tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel delete mode 100644 tests/org.eclipse.xtext.tests/model/generated/XtextGrammarTestLanguage.ecore delete mode 100644 tests/org.eclipse.xtext.tests/model/generated/XtextGrammarTestLanguage.genmodel delete mode 100644 tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2 delete mode 100644 tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend create mode 100644 tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSemanticSequencer.java create mode 100644 tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSyntacticSequencer.java diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginGenerator.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginGenerator.xtend index 1adddbfcb..267a93fd6 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginGenerator.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/idea/IdeaPluginGenerator.xtend @@ -35,7 +35,7 @@ import org.eclipse.xtext.parser.antlr.Lexer import org.eclipse.xtext.parser.antlr.LexerBindings import org.eclipse.xtext.service.LanguageSpecific import org.eclipse.xtext.util.Modules2 -import org.eclipse.xtext.xtext.generator.AbstractStubGeneratingFragment +import org.eclipse.xtext.xtext.generator.AbstractXtextGeneratorFragment import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming import org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessExtensions import org.eclipse.xtext.xtext.generator.model.FileAccessFactory @@ -49,10 +49,8 @@ import org.eclipse.xtext.xtext.generator.xbase.XbaseUsageDetector import static extension org.eclipse.xtext.EcoreUtil2.* import static extension org.eclipse.xtext.GrammarUtil.* import static extension org.eclipse.xtext.xtext.generator.model.TypeReference.* -import com.google.inject.Injector -import com.google.inject.Module -class IdeaPluginGenerator extends AbstractStubGeneratingFragment { +class IdeaPluginGenerator extends AbstractXtextGeneratorFragment { @Inject extension XtextGeneratorNaming @Inject extension XbaseUsageDetector @Inject ContentAssistGrammarNaming caNaming @@ -398,28 +396,15 @@ class IdeaPluginGenerator extends AbstractStubGeneratingFragment { } def compileFileType(Grammar grammar) { - if (isGenerateXtendStub) { - fileAccessFactory.createXtendFile(grammar.fileType, ''' - class «grammar.fileType.simpleName» extends «grammar.abstractFileType» { - public static final «grammar.fileType.simpleName» INSTANCE = new «grammar.fileType.simpleName»() - - new() { - super(«grammar.ideaLanguage».INSTANCE) - } + fileAccessFactory.createXtendFile(grammar.fileType, ''' + class «grammar.fileType.simpleName» extends «grammar.abstractFileType» { + public static final «grammar.fileType.simpleName» INSTANCE = new «grammar.fileType.simpleName»() + + new() { + super(«grammar.ideaLanguage».INSTANCE) } - ''') - } else { - fileAccessFactory.createJavaFile(grammar.fileType, ''' - public class «grammar.fileType.simpleName» extends «grammar.abstractFileType» { - public static final «grammar.fileType.simpleName» INSTANCE = new «grammar.fileType.simpleName»(); - - public «grammar.fileType.simpleName»() { - super(«grammar.ideaLanguage».INSTANCE); - } - } - ''') - - } + } + ''') } def compileLanguage(Grammar grammar) { @@ -437,57 +422,29 @@ class IdeaPluginGenerator extends AbstractStubGeneratingFragment { } def compileStandaloneSetup(Grammar grammar) { - if (isGenerateXtendStub) { - fileAccessFactory.createXtendFile(grammar.ideaStandaloneSetup, ''' - class «grammar.ideaStandaloneSetup.simpleName» extends «grammar.runtimeGenSetup» { - override createInjector() { - val runtimeModule = new «grammar.runtimeModule»() - val ideaModule = new «grammar.ideaModule»() - val mergedModule = «Modules2».mixin(runtimeModule, ideaModule) - return «Guice».createInjector(mergedModule) - } + fileAccessFactory.createXtendFile(grammar.ideaStandaloneSetup, ''' + class «grammar.ideaStandaloneSetup.simpleName» extends «grammar.runtimeGenSetup» { + override createInjector() { + val runtimeModule = new «grammar.runtimeModule»() + val ideaModule = new «grammar.ideaModule»() + val mergedModule = «Modules2».mixin(runtimeModule, ideaModule) + return «Guice».createInjector(mergedModule) } - ''') - } else { - fileAccessFactory.createJavaFile(grammar.ideaStandaloneSetup, ''' - public class «grammar.ideaStandaloneSetup.simpleName» extends «grammar.runtimeGenSetup» { - @Override - public «Injector» createInjector() { - «grammar.runtimeModule» runtimeModule = new «grammar.runtimeModule»(); - «grammar.ideaModule» ideaModule = new «grammar.ideaModule»(); - «Module» mergedModule = «Modules2».mixin(runtimeModule, ideaModule); - return «Guice».createInjector(mergedModule); - } - } - ''') - } + } + ''') } def compileIdeaSetup(Grammar grammar) { - if (generateXtendStub) { - fileAccessFactory.createXtendFile(grammar.ideaSetup, ''' - class «grammar.ideaSetup.simpleName» implements «ISetup» { - - override createInjectorAndDoEMFRegistration() { - «"org.eclipse.xtext.idea.extensions.EcoreGlobalRegistries".typeRef».ensureInitialized - new «grammar.ideaStandaloneSetup»().createInjector - } - + fileAccessFactory.createXtendFile(grammar.ideaSetup, ''' + class «grammar.ideaSetup.simpleName» implements «ISetup» { + + override createInjectorAndDoEMFRegistration() { + «"org.eclipse.xtext.idea.extensions.EcoreGlobalRegistries".typeRef».ensureInitialized + new «grammar.ideaStandaloneSetup»().createInjector } - ''') - } else { - fileAccessFactory.createJavaFile(grammar.ideaSetup, ''' - public class «grammar.ideaSetup.simpleName» implements «ISetup» { - - @Override - public «Injector» createInjectorAndDoEMFRegistration() { - «"org.eclipse.xtext.idea.extensions.EcoreGlobalRegistries".typeRef».ensureInitialized(); - return new «grammar.ideaStandaloneSetup»().createInjector(); - } - - } - ''') - } + + } + ''') } def compileElementTypeProvider(Grammar grammar) { @@ -677,7 +634,7 @@ class IdeaPluginGenerator extends AbstractStubGeneratingFragment { «IF rule.named» return new «'org.eclipse.xtext.psi.impl.PsiNamedEObjectImpl'.typeRef»(node) {}; «ELSE» - return new «'org.eclipse.xtext.psi.impl.PsiEObjectImpl'.typeRef»(node) {}; + return new «'org.eclipse.xtext.psi.impl.PsiEObjectImpl'»(node) {}; «ENDIF» } «FOR element : rule.EObjectElements» @@ -685,7 +642,7 @@ class IdeaPluginGenerator extends AbstractStubGeneratingFragment { «IF element.named» return new «'org.eclipse.xtext.psi.impl.PsiNamedEObjectImpl'.typeRef»(node) {}; «ELSE» - return new «'org.eclipse.xtext.psi.impl.PsiEObjectImpl'.typeRef»(node) {}; + return new «'org.eclipse.xtext.psi.impl.PsiEObjectImpl'»(node) {}; «ENDIF» } «ENDFOR» @@ -732,35 +689,18 @@ class IdeaPluginGenerator extends AbstractStubGeneratingFragment { } def JavaFileAccess compileCompletionContributor(Grammar grammar) { - if (isGenerateXtendStub) { - - fileAccessFactory.createXtendFile(grammar.completionContributor, ''' - class «grammar.completionContributor.simpleName» extends «grammar.abstractCompletionContributor» { - new() { - this(«grammar.ideaLanguage».INSTANCE) - } - - new(«"org.eclipse.xtext.idea.lang.AbstractXtextLanguage".typeRef» lang) { - super(lang) - //custom rules here - } + fileAccessFactory.createXtendFile(grammar.completionContributor, ''' + class «grammar.completionContributor.simpleName» extends «grammar.abstractCompletionContributor» { + new() { + this(«grammar.ideaLanguage».INSTANCE) } - ''') - } else { - - fileAccessFactory.createJavaFile(grammar.completionContributor, ''' - public class «grammar.completionContributor.simpleName» extends «grammar.abstractCompletionContributor» { - public «grammar.completionContributor.simpleName»() { - this(«grammar.ideaLanguage».INSTANCE); - } - - public «grammar.completionContributor.simpleName»(«"org.eclipse.xtext.idea.lang.AbstractXtextLanguage".typeRef» lang) { - super(lang); - //custom rules here - } + + new(«"org.eclipse.xtext.idea.lang.AbstractXtextLanguage".typeRef» lang) { + super(lang) + //custom rules here } - ''') - } + } + ''') } def TextFileAccess compileServicesISetup(Grammar grammar) { fileAccessFactory.createTextFile( @@ -770,11 +710,7 @@ class IdeaPluginGenerator extends AbstractStubGeneratingFragment { } def JavaFileAccess compileFacetConfiguration(Grammar grammar) { - val file = if (isGenerateXtendStub) { - fileAccessFactory.createXtendFile(grammar.facetConfiguration) - } else { - fileAccessFactory.createJavaFile(grammar.facetConfiguration) - } + val file = fileAccessFactory.createXtendFile(grammar.facetConfiguration) file.importType("com.intellij.openapi.components.PersistentStateComponent".typeRef) file.importType("com.intellij.openapi.components.State".typeRef) file.importType("com.intellij.openapi.components.Storage".typeRef) @@ -788,18 +724,11 @@ class IdeaPluginGenerator extends AbstractStubGeneratingFragment { file.importType("org.eclipse.xtext.idea.facet.GeneratorConfigurationState".typeRef) } file.content = ''' - «IF isGenerateXtendStub» - @State(name = "«grammar.name»Generator", storages = #[ - @Storage(id = "default", file = StoragePathMacros.PROJECT_FILE), - @Storage(id = "dir", file = StoragePathMacros.PROJECT_CONFIG_DIR - + "/«grammar.simpleName»GeneratorConfig.xml", scheme = StorageScheme.DIRECTORY_BASED)]) - «ELSE» - @State(name = "«grammar.name»Generator", storages = { - @Storage(id = "default", file = StoragePathMacros.PROJECT_FILE), - @Storage(id = "dir", file = StoragePathMacros.PROJECT_CONFIG_DIR - + "/«grammar.simpleName»GeneratorConfig.xml", scheme = StorageScheme.DIRECTORY_BASED)}) - «ENDIF» - «IF !isGenerateXtendStub»public«ENDIF» class «grammar.facetConfiguration.simpleName» extends «IF grammar.inheritsXbase»XbaseFacetConfiguration implements PersistentStateComponent«ELSE»AbstractFacetConfiguration implements PersistentStateComponent«ENDIF»{ + @State(name = "«grammar.name»Generator", storages = #[ + @Storage(id = "default", file = StoragePathMacros.PROJECT_FILE), + @Storage(id = "dir", file = StoragePathMacros.PROJECT_CONFIG_DIR + + "/«grammar.simpleName»GeneratorConfig.xml", scheme = StorageScheme.DIRECTORY_BASED)]) + class «grammar.facetConfiguration.simpleName» extends «IF grammar.inheritsXbase»XbaseFacetConfiguration implements PersistentStateComponent«ELSE»AbstractFacetConfiguration implements PersistentStateComponent«ENDIF»{ } ''' @@ -838,16 +767,9 @@ class IdeaPluginGenerator extends AbstractStubGeneratingFragment { } def JavaFileAccess compileColorSettingsPage(Grammar grammar) { - if (isGenerateXtendStub) { - fileAccessFactory.createXtendFile(grammar.colorSettingsPage, ''' - class «grammar.colorSettingsPage.simpleName» extends «grammar.baseColorSettingsPage» { - } - ''') - } else { - fileAccessFactory.createJavaFile(grammar.colorSettingsPage, ''' - public class «grammar.colorSettingsPage.simpleName» extends «grammar.baseColorSettingsPage» { - } - ''') - } + fileAccessFactory.createXtendFile(grammar.colorSettingsPage, ''' + class «grammar.colorSettingsPage.simpleName» extends «grammar.baseColorSettingsPage» { + } + ''') } } diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/RuntimeProjectConfig.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/RuntimeProjectConfig.xtend index 37fbbf28b..442846d86 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/RuntimeProjectConfig.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/RuntimeProjectConfig.xtend @@ -34,12 +34,7 @@ class RuntimeProjectConfig extends BundleProjectConfig implements IRuntimeProjec val relativePath = ecoreModel.path.substring(root.path.length).replace('\\', '/') return CharMatcher.is('/').trimFrom(relativePath) } - throw new RuntimeException(''' - Could not derive the Ecore model folder from the project configuration. - Please make sure that \'root\' is a prefix of \'ecoreModel\'. - was (root='«root.path»', ecoreModel='«ecoreModel.path»') - - ''') + throw new RuntimeException('Could not derive the Ecore model folder from the project configuration. Please make sure that \'root\' is a prefix of \'ecoreModel\'.') } override initialize(Injector injector) { diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/SubProjectConfig.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/SubProjectConfig.xtend index 6e0fef593..74cd19889 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/SubProjectConfig.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/project/SubProjectConfig.xtend @@ -24,9 +24,6 @@ class SubProjectConfig implements ISubProjectConfig { @Accessors boolean enabled - @Accessors - boolean overwriteSrc - @Accessors String name @@ -75,19 +72,19 @@ class SubProjectConfig implements ISubProjectConfig { override initialize(Injector injector) { injector.injectMembers(this) - if (!rootPath.isNullOrEmpty) { + if (rootPath !== null) { root = owner.newFileSystemAccess(rootPath, true) root.initialize(injector) } - if (!metaInfPath.isNullOrEmpty) { + if (metaInfPath !== null) { metaInf = owner.newFileSystemAccess(metaInfPath, true) metaInf.initialize(injector) } - if (!srcPath.isNullOrEmpty) { - src = owner.newFileSystemAccess(srcPath, overwriteSrc) + if (srcPath !== null) { + src = owner.newFileSystemAccess(srcPath, false) src.initialize(injector) } - if (!srcGenPath.isNullOrEmpty) { + if (srcGenPath !== null) { srcGen = owner.newFileSystemAccess(srcGenPath, true) srcGen.initialize(injector) } diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend index 084adc0cc..8d55a4187 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend @@ -94,8 +94,6 @@ abstract class AbstractAntlrGrammarGenerator { «compileTokens(options)» «compileLexerHeader(options)» «compileKeywordRules(options)» - - // Rules duplicated to allow inter-rule references «compileTerminalRules(options)» ''' @@ -198,28 +196,22 @@ abstract class AbstractAntlrGrammarGenerator { val allKeywords = allKeywords.sort.sortBy[-length] val allTerminalRules = allTerminalRules - val synthetic_kw_alternatives = newArrayList - synthetic_kw_alternatives.addAll(allKeywords.indexed.map[ - val ruleName = keywordHelper.getRuleName(value) - return '''(FRAGMENT_«ruleName»)=> FRAGMENT_«ruleName» {$type = «ruleName»; }''' - ]) - synthetic_kw_alternatives.addAll(allTerminalRules.indexed.map[ - if (!isSyntheticTerminalRule(value) && !value.fragment) { - return '''(FRAGMENT_«value.ruleName»)=> FRAGMENT_«value.ruleName» {$type = «value.ruleName»; }''' - } - ].filterNull.toList) - ''' «IF options.isBacktrackLexer» SYNTHETIC_ALL_KEYWORDS : - «FOR kw: synthetic_kw_alternatives SEPARATOR ' |'» - «kw» - «ENDFOR» + «FOR kw: allKeywords.indexed» + (FRAGMENT_«keywordHelper.getRuleName(kw.value)»)=> FRAGMENT_«keywordHelper.getRuleName(kw.value)» {$type = «keywordHelper.getRuleName(kw.value)»; } + «IF kw.key != allKeywords.size || !allTerminalRules().isEmpty»|«ENDIF» + «ENDFOR» + «FOR rule : allTerminalRules.indexed» + «IF !isSyntheticTerminalRule(rule.value) && !rule.value.fragment» + (FRAGMENT_«rule.value.ruleName()»)=> FRAGMENT_«rule.value.ruleName()» {$type = «rule.value.ruleName()»; } + «IF rule.key != allTerminalRules.size»|«ENDIF» + «ENDIF» + «ENDFOR» ; - «FOR kw: allKeywords» fragment FRAGMENT_«keywordHelper.getRuleName(kw)» : '«kw.toAntlrString()»'; - «ENDFOR» «ELSE» «FOR rule:allKeywords» diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend index 5f0f2fea2..7b60e048d 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend @@ -32,21 +32,13 @@ class GrammarNaming { protected def String getInternalParserPackage(Grammar it) { parserPackage + ".internal" } - - protected def String getInternalLexerPackage(Grammar it) { - parserPackage + ".lexer" - } def AntlrGrammar getParserGrammar(Grammar it) { new AntlrGrammar(internalParserPackage, '''«grammarNamePrefix»Internal«simpleName»«IF !combinedGrammar»Parser«ENDIF»''') } def AntlrGrammar getLexerGrammar(Grammar it) { - if (combinedGrammar) { - getParserGrammar(it) - } else { - new AntlrGrammar(internalLexerPackage, '''«grammarNamePrefix»Internal«simpleName»Lexer''') - } + new AntlrGrammar(internalParserPackage, '''«grammarNamePrefix»Internal«simpleName»«IF !combinedGrammar»Lexer«ENDIF»''') } protected def String getGrammarNamePrefix(Grammar it) { diff --git a/tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.ecore b/tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.ecore deleted file mode 100644 index 341657813..000000000 --- a/tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.ecore +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.genmodel b/tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.genmodel deleted file mode 100644 index 787632545..000000000 --- a/tests/org.eclipse.xtext.tests/model/generated/BacktrackingLexerTestLanguage.genmodel +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore b/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore deleted file mode 100644 index 564a3db99..000000000 --- a/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.ecore +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel b/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel deleted file mode 100644 index 0f44ed9ca..000000000 --- a/tests/org.eclipse.xtext.tests/model/generated/SubTestLanguage.genmodel +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - diff --git a/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore b/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore deleted file mode 100644 index d7e5d0659..000000000 --- a/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.ecore +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel b/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel deleted file mode 100644 index adbb3fdde..000000000 --- a/tests/org.eclipse.xtext.tests/model/generated/SuperTestLanguage.genmodel +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - diff --git a/tests/org.eclipse.xtext.tests/model/generated/XtextGrammarTestLanguage.ecore b/tests/org.eclipse.xtext.tests/model/generated/XtextGrammarTestLanguage.ecore deleted file mode 100644 index 6d281148b..000000000 --- a/tests/org.eclipse.xtext.tests/model/generated/XtextGrammarTestLanguage.ecore +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/org.eclipse.xtext.tests/model/generated/XtextGrammarTestLanguage.genmodel b/tests/org.eclipse.xtext.tests/model/generated/XtextGrammarTestLanguage.genmodel deleted file mode 100644 index 9f2240bb1..000000000 --- a/tests/org.eclipse.xtext.tests/model/generated/XtextGrammarTestLanguage.genmodel +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2 deleted file mode 100644 index 44f596d6d..000000000 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages2.mwe2 +++ /dev/null @@ -1,596 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ -module org.eclipse.xtext.GenerateAllTestLanguages2 - -import org.eclipse.emf.mwe2.runtime.workflow.Workflow -import org.eclipse.emf.mwe.utils.* -import org.eclipse.xtext.generator.* - -var projectName = "org.eclipse.xtext.tests" -var runtimeProject = "../${projectName}" -var ideaProject = "../../intellij/org.eclipse.xtext.core.idea.tests" -var lineDelimiter = '\n' - -Workflow { - bean = StandaloneSetup { - ignoreBrokenProjectFiles = true - platformUri = "${runtimeProject}/.." - platformUri = "${runtimeProject}/../../plugins" - scanClassPath = true - uriMap = { - from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore" - to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore" - } - uriMap = { - from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel" - to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel" - } - registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/grammarinheritance/ametamodel.genmodel" - registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel" - registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/generator/ecore/Genmodel.genmodel" - registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel" - registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/enumrules/enums.genmodel" - registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel" - registerGenModelFile = "platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel" - registerGenModelFile = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel" - - registerGeneratedEPackage = "org.eclipse.xtext.grammarinheritance.ametamodel.AmetamodelPackage" - registerGeneratedEPackage = "org.eclipse.xtext.XtextPackage" - registerGeneratedEPackage = "org.eclipse.emf.ecore.EcorePackage" - } - - bean = ecore.EcoreSupportStandaloneSetup {} - component = org.eclipse.emf.mwe2.ecore.EcoreGenerator { - genModel = "platform:/resource/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel" - srcPath = "foo" - lineDelimiter = lineDelimiter - } - component = org.eclipse.xtext.generator.ecore.GenModelAccessTestGenerator {} - - component = xtext.generator.XtextGenerator { - cleaner = { - enabled = false - } - configuration = xtext.generator.DefaultGeneratorModule { - code = { - preferXtendStubs = false - fileHeader = -"/* - * generated by Xtext - */" - } - project = xtext.generator.model.project.StandardProjectConfig { - baseName = projectName - rootPath = ".." - runtime = { - enabled = true - root = runtimeProject - } - runtimeTest = { - enabled = true - root = runtimeProject - } - ideaPlugin = { - enabled = true - root = ideaProject - overwriteSrc = true - } - genericIde = { - enabled = true - root = ideaProject - overwriteSrc = true - } - } - } - language = TestLanguage { - name = "org.eclipse.xtext.generator.ecore.SuperTestLanguage" - } - language = TestLanguage { - name = "org.eclipse.xtext.generator.ecore.SubTestLanguage" - } - language = TestLanguage { - name = "org.eclipse.xtext.XtextGrammarTestLanguage" - } - language = TestLanguage { - name = "org.eclipse.xtext.lexer.BacktrackingLexerTestLanguage" - parserOptions = { - backtrack = true - backtrackLexer = true - memoize = true - classSplitting = true - } - } -// -// language = TestLanguage { -// name = "org.eclipse.xtext.lexer.IgnoreCaseLexerTestLanguage" -// parserGenerator = { -// options = { -// ignoreCase = true -// } -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.linking.lazy.LazyLinkingTestLanguage" -// fragment = xtext.generator.junit.Junit4Fragment2 {} -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.linking.Bug287988TestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.linking.Bug289059TestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.linking.Bug313089TestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.linking.ImportUriTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.linking.LangATestLanguage" -// fragment = xtext.generator.scoping.ImportNamespacesScopingFragment2 {} -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.linking.Bug362902" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.linking.AbstractIgnoreCaseLinkingTestLanguage" -// serializer = { -// generateStub = false -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.linking.IgnoreCaseNamespacesTestLanguage" -// fragment = xtext.generator.scoping.ImportNamespacesScopingFragment2 { -// ignoreCase = true -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.linking.IgnoreCaseImportsTestLanguage" -// fragment = adapter.FragmentAdapter { -// fragment = scoping.ImportURIScopingFragment { -// ignoreCase = true -// } -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.linking.lazy.Bug311337TestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.dummy.DummyTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.enumrules.EnumRulesTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.enumrules.EnumAndReferenceTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.enumrules.MultiRuleEnumTestLanguage" -// } - -// language = TestLanguage { -// name = "org.eclipse.xtext.generator.ecore.EcoreFragmentTestLanguage" -// referencedResource = "platform:/resource/${projectName}/src/org/eclipse/xtext/generator/ecore/Genmodel.genmodel" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.generator.grammarAccess.GrammarAccessTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.grammarinheritance.AbstractTestLanguage" -// serializer = { -// generateStub = false -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.grammarinheritance.BaseInheritanceTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.grammarinheritance.ConcreteTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.grammarinheritance.InheritanceTestLanguage" -// serializer = { -// generateStub = false -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.grammarinheritance.InheritanceTest2Language" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.grammarinheritance.InheritanceTest3Language" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.index.IndexTestLanguage" -// } -// language = TestLanguage { -// referencedResource = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore" -// referencedResource = "platform:/resource/${projectName}/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerNsURI.ecore" -// referencedResource = "platform:/resource/${projectName}/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerPlatformPlugin.ecore" -// referencedResource = "platform:/resource/${projectName}/src/org/eclipse/xtext/metamodelreferencing/tests/EcorePerPlatformResource.ecore" -// name = "org.eclipse.xtext.metamodelreferencing.tests.EcoreReferenceTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.metamodelreferencing.tests.MetamodelRefTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.metamodelreferencing.tests.MultiGenMMTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.antlr.Bug289515TestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.antlr.Bug289524TestLanguage" -// parserGenerator = { -// options = { -// backtrack = true -// } -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.antlr.Bug289524ExTestLanguage" -// parserGenerator = { -// options = { -// backtrack = true -// } -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.antlr.Bug296889TestLanguage" -// parserGenerator = { -// options = { -// backtrack = true -// } -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.antlr.Bug296889ExTestLanguage" -// parserGenerator = { -// options = { -// backtrack = true -// } -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.antlr.Bug299237TestLanguage" -// parserGenerator = { -// options = { -// ignoreCase = true -// } -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.antlr.Bug301935TestLanguage" -// serializer = { -// generateStub = false -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.antlr.Bug378967TestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.antlr.Bug301935ExTestLanguage" -// parserGenerator = { -// options = { -// ignoreCase = true -// } -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.antlr.Bug443221TestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.assignments.AssignmentsTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.assignments.Bug287184TestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.assignments.Bug288432TestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.bug419429.Bug419429" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.datatyperules.DatatypeRulesTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.epatch.EpatchTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.fragments.FragmentTestLanguage" -// fragment = xtext.generator.junit.Junit4Fragment2 {} -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.fragments.FragmentTestLanguageEx" -// fragment = xtext.generator.junit.Junit4Fragment2 {} -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.indentation.IndentationAwareTestLanguage" -// serializer = { -// generateStub = false -// } -// fragment = xtext.generator.junit.Junit4Fragment2 {} -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.keywords.KeywordsTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.parameters.ParametersTestLanguage" -// fragment = xtext.generator.junit.Junit4Fragment2 {} -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.parameters.TwoParametersTestLanguage" -// fragment = xtext.generator.junit.Junit4Fragment2 {} -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.parameters.NoParametersTestLanguage" -// fragment = xtext.generator.junit.Junit4Fragment2 {} -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.parameters.ParametersTestLanguageEx" -// fragment = xtext.generator.junit.Junit4Fragment2 {} -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.terminalrules.Bug292245TestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.terminalrules.Bug297105TestLanguage" -// parserGenerator = { -// options = { -// backtrack = true -// } -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.terminalrules.Bug317840TestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.terminalrules.EcoreTerminalsTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.terminalrules.HiddenTerminalsTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.terminalrules.UnicodeTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.terminalrules.XtextTerminalsTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.unorderedGroups.UnorderedGroupsTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.unorderedGroups.SimpleUnorderedGroupsTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.unorderedGroups.ExUnorderedGroupsTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.unorderedGroups.BacktrackingBug325745TestLanguage" -// parserGenerator = { -// options = { -// backtrack = true -// } -// } -// serializer = { -// generateStub = false -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.unorderedGroups.SimpleBacktrackingBug325745TestLanguage" -// parserGenerator = { -// options = { -// backtrack = true -// } -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.unorderedGroups.ExBacktrackingBug325745TestLanguage" -// parserGenerator = { -// options = { -// backtrack = true -// } -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.formatting2.internal.FormatterTestLanguage" -// fragment = xtext.generator.junit.Junit4Fragment2 {} -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.formatting2.regionaccess.internal.RegionAccessTestLanguage" -// fragment = xtext.generator.junit.Junit4Fragment2 {} -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.formatter.FormatterTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.formatter.ElementMatcherTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.impl.Bug305397" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.impl.CommentAssociationTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.reconstr.PartialSerializationTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.reconstr.Bug299395TestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.reconstr.ComplexReconstrTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.reconstr.SimpleReconstrTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.reconstr.SerializationBug269362TestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.reconstr.SerializationErrorTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.reconstr.HiddenTokensMergerTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.reconstr.Bug302128TestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.serializer.HiddenTokenSequencerTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.serializer.SequencerTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.serializer.SyntacticSequencerTestLanguage" -// serializer = { -// generateStub = false -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.serializer.ContextFinderTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.serializer.AssignmentFinderTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.unassignedtext.UnassignedTextTestLanguage" -// serializer = { -// generateStub = false -// } -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parsetree.transientvalues.TransientValuesTest" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.testlanguages.ActionTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.testlanguages.ActionTestLanguage2" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.testlanguages.FowlerDslTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.testlanguages.LookaheadTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.testlanguages.OptionalEmptyTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.testlanguages.PartialParserTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.testlanguages.TestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.testlanguages.TreeTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.valueconverter.Bug250313" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.valueconverter.QualifiedNameTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.xtext.ecoreInference.MultiValueFeatureTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.validation.ConcreteSyntaxValidationTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.resource.EObjectAtOffsetTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.resource.LocationProviderTestLanguage" -// -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.resource.LiveContainerTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.resource.LiveContainerBuilderIntegerationTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.resource.Bug385636TestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.parser.encoding.EncodingTestLanguage" -// } -// language = TestLanguage { -// name = "org.eclipse.xtext.testlanguages.indent.IndentationAwareTestLanguage" -// -// } - } - -} - - diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend deleted file mode 100644 index d98629d56..000000000 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguage.xtend +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 itemis AG (http://www.itemis.eu) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ -package org.eclipse.xtext - -import java.util.ArrayList -import org.eclipse.xtext.xtext.generator.XtextGeneratorLanguage -import org.eclipse.xtext.xtext.generator.ecore.EMFGeneratorFragment2 -import org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessFragment2 -import org.eclipse.xtext.xtext.generator.idea.IdeaPluginGenerator -import org.eclipse.xtext.xtext.generator.idea.parser.antlr.XtextAntlrIDEAGeneratorFragment -import org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 -import org.eclipse.xtext.xtext.generator.resourceFactory.ResourceFactoryFragment2 -import org.eclipse.xtext.xtext.generator.serializer.SerializerFragment2 -import org.eclipse.xtend.lib.annotations.Accessors -import org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorComparisonFragment -import org.eclipse.xtext.generator.parser.antlr.AntlrOptions - -/** - * @author efftinge - Initial contribution and API - */ -@Accessors -class TestLanguage extends XtextGeneratorLanguage { - - org.eclipse.xtext.xtext.generator.parser.antlr.AntlrOptions parserOptions = new org.eclipse.xtext.xtext.generator.parser.antlr.AntlrOptions() => [ - classSplitting = true - ] - - def void setParserOptions(org.eclipse.xtext.xtext.generator.parser.antlr.AntlrOptions parserOptions) { - this.parserOptions = parserOptions - parserGenerator.options = parserOptions - ideaParser.options = parserOptions - } - - GrammarAccessFragment2 grammarAccess = new GrammarAccessFragment2 - SerializerFragment2 serializer = new SerializerFragment2 => [ - generateStub = false - ] - ResourceFactoryFragment2 resourceFactoryFragment = new ResourceFactoryFragment2 - EMFGeneratorFragment2 emfGenerator = new EMFGeneratorFragment2 - XtextAntlrGeneratorFragment2 parserGenerator = new XtextAntlrGeneratorFragment2 => [ - debugGrammar = true - options = parserOptions - ] - XtextAntlrIDEAGeneratorFragment ideaParser = new XtextAntlrIDEAGeneratorFragment => [ - options = parserOptions - ] - - IdeaPluginGenerator ideaPlugin = new IdeaPluginGenerator - - override protected getImplicitFragments() { - val result = new ArrayList(super.getImplicitFragments()) - result += parserGenerator - val comparison = new XtextAntlrGeneratorComparisonFragment - comparison.setOptions(new AntlrOptions() => [ - it.backtrack = parserGenerator.options.backtrack - it.backtrackLexer = parserGenerator.options.backtrackLexer - it.classSplitting = parserGenerator.options.classSplitting - it.casesPerSpecialStateSwitch = parserGenerator.options.casesPerSpecialStateSwitch.toString - it.fieldsPerClass = parserGenerator.options.fieldsPerClass.toString - it.ignoreCase = parserGenerator.options.ignoreCase - it.k = parserGenerator.options.k - it.memoize = parserGenerator.options.memoize - it.optimizeCodeQuality= parserGenerator.options.optimizeCodeQuality - it.skipUnusedRules = parserGenerator.options.skipUnusedRules - it.stripAllComments = parserGenerator.options.stripAllComments - ]); - result += comparison - result += grammarAccess - result += emfGenerator - result += serializer - result += resourceFactoryFragment - result += ideaParser - result += ideaPlugin - return result - } - -} diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSemanticSequencer.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSemanticSequencer.java new file mode 100644 index 000000000..1d82c8baf --- /dev/null +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSemanticSequencer.java @@ -0,0 +1,4 @@ +package org.eclipse.xtext.generator.ecore.serializer; + +public class SuperTestLanguageSemanticSequencer extends AbstractSuperTestLanguageSemanticSequencer { +} diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSyntacticSequencer.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSyntacticSequencer.java new file mode 100644 index 000000000..f3e28bc32 --- /dev/null +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/serializer/SuperTestLanguageSyntacticSequencer.java @@ -0,0 +1,4 @@ +package org.eclipse.xtext.generator.ecore.serializer; + +public class SuperTestLanguageSyntacticSequencer extends AbstractSuperTestLanguageSyntacticSequencer { +}