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

fix order of standard language fragments

Browse source
This commit is contained in:
Stefan Oehme 2015-10-22 08:59:51 +02:00
parent 37218795e8
commit eb1cc00bd5
3 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/StandardLanguage.xtend
View file

@ -7,7 +7,6 @@
*******************************************************************************/
package org.eclipse.xtext.xtext.generator
import com.google.inject.Injector
import org.eclipse.xtend.lib.annotations.Accessors
import org.eclipse.xtext.util.internal.Log
import org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2
@ -119,39 +118,35 @@ import org.eclipse.xtext.xtext.generator.xbase.XtypeGeneratorFragment2
}
}
override initialize(Injector injector) {
prependStandardFragments()
super.initialize(injector)
override protected getImplicitFragments() {
val fragments = newArrayList
fragments += super.getImplicitFragments
fragments.add(grammarAccess)
fragments.add(emfGenerator)
fragments.add(serializer)
fragments.add(resourceFactoryFragment)
fragments.add(parserGenerator)
fragments.add(validator)
fragments.add(scopeProvider)
fragments.add(qualifiedNamesProvider)
fragments.add(builder)
fragments.add(generator)
fragments.add(formatter)
fragments.add(labelProvider)
fragments.add(quickOutline)
fragments.add(outline)
fragments.add(quickFixProvider)
fragments.add(contentAssist)
fragments.add(junitSupport)
fragments.add(renameRefactoring)
fragments.add(commonTypesSupport)
fragments.add(xbaseSupport)
fragments.add(xtypeSupport)
fragments.add(codeTemplates)
fragments.add(compareEditor)
fragments.add(ideaParser)
fragments.add(ideaPlugin)
fragments.add(webSupport)
fragments
}
protected def prependStandardFragments() {
var i = 0
fragments.add(i++,grammarAccess)
fragments.add(i++,emfGenerator)
fragments.add(i++,resourceFactoryFragment)
fragments.add(i++,serializer)
fragments.add(i++,parserGenerator)
fragments.add(i++,validator)
fragments.add(i++,formatter)
fragments.add(i++,generator)
fragments.add(i++,builder)
fragments.add(i++,scopeProvider)
fragments.add(i++,qualifiedNamesProvider)
fragments.add(i++,commonTypesSupport)
fragments.add(i++,xtypeSupport)
fragments.add(i++,xbaseSupport)
fragments.add(i++,junitSupport)
fragments.add(i++,quickFixProvider)
fragments.add(i++,labelProvider)
fragments.add(i++,outline)
fragments.add(i++,quickOutline)
fragments.add(i++,compareEditor)
fragments.add(i++,contentAssist)
fragments.add(i++,renameRefactoring)
fragments.add(i++,codeTemplates)
fragments.add(i++,ideaParser)
fragments.add(i++,ideaPlugin)
fragments.add(i++,webSupport)
}
}

8
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorLanguage.xtend
View file

@ -112,7 +112,7 @@ class XtextGeneratorLanguage extends CompositeGeneratorFragment implements IXtex
}
override initialize(Injector injector) {
fragments.add(0, new ImplicitFragment)
fragments.addAll(0, implicitFragments)
injector.injectMembers(XtextGeneratorLanguage)
if (resourceSet === null)
resourceSet = resourceSetProvider.get()
@ -147,6 +147,12 @@ class XtextGeneratorLanguage extends CompositeGeneratorFragment implements IXtex
super.initialize(injector)
}
protected def List<? extends IXtextGeneratorFragment> getImplicitFragments() {
val fragments = newArrayList
fragments += new ImplicitFragment
fragments
}
def void initialize(Grammar grammar) {
this.grammar = grammar
this.ruleNames = RuleNames.getRuleNames(grammar, true)

2
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend
View file

@ -91,7 +91,7 @@ class Junit4Fragment2 extends AbstractXtextGeneratorFragment {
def JavaFileAccess generateInjectorProvider() {
val file = fileAccessFactory.createJavaFile(injectorProvider)
val globalRegistries = new TypeReference("org.eclipse.xtext.junit4.GlobalRegistries")
val globalStateMemento = new TypeReference("org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento")
val globalStateMemento = new TypeReference("org.eclipse.xtext.junit4", "GlobalRegistries.GlobalStateMemento")
val iRegistryConfigurator = new TypeReference("org.eclipse.xtext.junit4.IRegistryConfigurator")
file.content = '''
public class «injectorProvider.simpleName» implements «iInjectorProvider», «iRegistryConfigurator» {