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

Merge pull request #792 from eclipse/msp/generatorFix01

Browse source 
[generator] Small fixes
This commit is contained in:
Miro Spönemann 2015-11-10 15:35:01 +01:00
commit 939b384d8f
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend
View file

@ -349,7 +349,7 @@ class XtextGeneratorTemplates {
*/
public class «webModule.simpleName» extends «webGenModule» {
public «webGenModule.simpleName»(«Provider»<«ExecutorService»> executorServiceProvider) {
public «webModule.simpleName»(«Provider»<«ExecutorService»> executorServiceProvider) {
super(executorServiceProvider);
}
}
@ -413,15 +413,16 @@ class XtextGeneratorTemplates {
public class «webSetup.simpleName» extends «runtimeSetup» {
private final «Provider»<«ExecutorService»> executorServiceProvider;
«webSetup.simpleName»(«Provider»<«ExecutorService»> executorServiceProvider) {
this.executorServiceProvider = executorServiceProvider
this.executorServiceProvider = executorServiceProvider;
}
@Override
public «Injector» createInjector() {
val runtimeModule = new «runtimeModule»()
val webModule = new «webModule»(executorServiceProvider)
return «Guice».createInjector(«Modules».override(runtimeModule).with(webModule))
«runtimeModule» runtimeModule = new «runtimeModule»();
«webModule» webModule = new «webModule»(executorServiceProvider);
return «Guice».createInjector(«Modules».override(runtimeModule).with(webModule));
}
}

4
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.xtend
View file

@ -115,7 +115,7 @@ class ContentAssistFragment2 extends AbstractInheritingFragment {
''').writeTo(projectConfig.eclipsePlugin.src)
}
def generateJavaProposalProviderStub() {
protected def generateJavaProposalProviderStub() {
fileAccessFactory.createJavaFile(grammar.proposalProviderClass, '''
/**
* See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#content-assist
@ -129,7 +129,7 @@ class ContentAssistFragment2 extends AbstractInheritingFragment {
// generation of the 'Abstract...ProposalProvider'
def generateGenJavaProposalProvider() {
protected def generateGenJavaProposalProvider() {
// excluded features are those that stem from inherited grammars,
// they are handled by the super grammars' proposal provider
val excludedFqnFeatureNames = grammar.getFQFeatureNamesToExclude