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

GH-524 use Module2.mixin() to combine runtime and IDE module in example languages

Browse source
This commit is contained in:
Jan Koehnlein 2017-11-07 08:54:24 +01:00
parent 7efac94bb7
commit 8c7295e56e
7 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/ide/PartialContentAssistTestLanguageIdeSetup.xtend
View file

@ -10,6 +10,7 @@ package org.eclipse.xtext.ide.tests.testlanguage.ide
import com.google.inject.Guice
import org.eclipse.xtext.ide.tests.testlanguage.PartialContentAssistTestLanguageRuntimeModule
import org.eclipse.xtext.ide.tests.testlanguage.PartialContentAssistTestLanguageStandaloneSetup
import org.eclipse.xtext.util.Modules2
/**
* Initialization support for running Xtext languages without Equinox extension registry.
@ -17,6 +18,6 @@ import org.eclipse.xtext.ide.tests.testlanguage.PartialContentAssistTestLanguage
class PartialContentAssistTestLanguageIdeSetup extends PartialContentAssistTestLanguageStandaloneSetup {
override createInjector() {
Guice.createInjector(new PartialContentAssistTestLanguageRuntimeModule, new PartialContentAssistTestLanguageIdeModule)
Guice.createInjector(Modules2.mixin(new PartialContentAssistTestLanguageRuntimeModule, new PartialContentAssistTestLanguageIdeModule))
}
}

3
org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/PartialContentAssistTestLanguageIdeSetup.java
View file

@ -12,6 +12,7 @@ import com.google.inject.Injector;
import org.eclipse.xtext.ide.tests.testlanguage.PartialContentAssistTestLanguageRuntimeModule;
import org.eclipse.xtext.ide.tests.testlanguage.PartialContentAssistTestLanguageStandaloneSetup;
import org.eclipse.xtext.ide.tests.testlanguage.ide.PartialContentAssistTestLanguageIdeModule;
import org.eclipse.xtext.util.Modules2;
/**
* Initialization support for running Xtext languages without Equinox extension registry.
@ -22,6 +23,6 @@ public class PartialContentAssistTestLanguageIdeSetup extends PartialContentAssi
public Injector createInjector() {
PartialContentAssistTestLanguageRuntimeModule _partialContentAssistTestLanguageRuntimeModule = new PartialContentAssistTestLanguageRuntimeModule();
PartialContentAssistTestLanguageIdeModule _partialContentAssistTestLanguageIdeModule = new PartialContentAssistTestLanguageIdeModule();
return Guice.createInjector(_partialContentAssistTestLanguageRuntimeModule, _partialContentAssistTestLanguageIdeModule);
return Guice.createInjector(Modules2.mixin(_partialContentAssistTestLanguageRuntimeModule, _partialContentAssistTestLanguageIdeModule));
}
}

8
org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/BeeLangTestLanguageIdeSetup.java
View file

@ -3,10 +3,12 @@
*/
package org.eclipse.xtext.testlanguages.backtracking.ide;
import com.google.inject.Guice;
import com.google.inject.Injector;
import org.eclipse.xtext.testlanguages.backtracking.BeeLangTestLanguageRuntimeModule;
import org.eclipse.xtext.testlanguages.backtracking.BeeLangTestLanguageStandaloneSetup;
import org.eclipse.xtext.util.Modules2;
import com.google.inject.Guice;
import com.google.inject.Injector;
/**
* Initialization support for running Xtext languages without Equinox extension registry.
@ -15,6 +17,6 @@ public class BeeLangTestLanguageIdeSetup extends BeeLangTestLanguageStandaloneSe
@Override
public Injector createInjector() {
return Guice.createInjector(new BeeLangTestLanguageRuntimeModule(), new BeeLangTestLanguageIdeModule());
return Guice.createInjector(Modules2.mixin(new BeeLangTestLanguageRuntimeModule(), new BeeLangTestLanguageIdeModule()));
}
}

3
org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/ExBeeLangTestLanguageIdeSetup.java
View file

@ -7,6 +7,7 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import org.eclipse.xtext.testlanguages.backtracking.ExBeeLangTestLanguageRuntimeModule;
import org.eclipse.xtext.testlanguages.backtracking.ExBeeLangTestLanguageStandaloneSetup;
import org.eclipse.xtext.util.Modules2;
/**
* Initialization support for running Xtext languages without Equinox extension registry.
@ -15,6 +16,6 @@ public class ExBeeLangTestLanguageIdeSetup extends ExBeeLangTestLanguageStandalo
@Override
public Injector createInjector() {
return Guice.createInjector(new ExBeeLangTestLanguageRuntimeModule(), new ExBeeLangTestLanguageIdeModule());
return Guice.createInjector(Modules2.mixin(new ExBeeLangTestLanguageRuntimeModule(), new ExBeeLangTestLanguageIdeModule()));
}
}

8
org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/backtracking/ide/SimpleBeeLangTestLanguageIdeSetup.java
View file

@ -3,10 +3,12 @@
*/
package org.eclipse.xtext.testlanguages.backtracking.ide;
import com.google.inject.Guice;
import com.google.inject.Injector;
import org.eclipse.xtext.testlanguages.backtracking.SimpleBeeLangTestLanguageRuntimeModule;
import org.eclipse.xtext.testlanguages.backtracking.SimpleBeeLangTestLanguageStandaloneSetup;
import org.eclipse.xtext.util.Modules2;
import com.google.inject.Guice;
import com.google.inject.Injector;
/**
* Initialization support for running Xtext languages without Equinox extension registry.
@ -15,6 +17,6 @@ public class SimpleBeeLangTestLanguageIdeSetup extends SimpleBeeLangTestLanguage
@Override
public Injector createInjector() {
return Guice.createInjector(new SimpleBeeLangTestLanguageRuntimeModule(), new SimpleBeeLangTestLanguageIdeModule());
return Guice.createInjector(Modules2.mixin(new SimpleBeeLangTestLanguageRuntimeModule(), new SimpleBeeLangTestLanguageIdeModule()));
}
}

3
org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/noJdt/ide/NoJdtTestLanguageIdeSetup.java
View file

@ -7,6 +7,7 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import org.eclipse.xtext.testlanguages.noJdt.NoJdtTestLanguageRuntimeModule;
import org.eclipse.xtext.testlanguages.noJdt.NoJdtTestLanguageStandaloneSetup;
import org.eclipse.xtext.util.Modules2;
/**
* Initialization support for running Xtext languages without Equinox extension registry.
@ -15,6 +16,6 @@ public class NoJdtTestLanguageIdeSetup extends NoJdtTestLanguageStandaloneSetup
@Override
public Injector createInjector() {
return Guice.createInjector(new NoJdtTestLanguageRuntimeModule(), new NoJdtTestLanguageIdeModule());
return Guice.createInjector(Modules2.mixin(new NoJdtTestLanguageRuntimeModule(), new NoJdtTestLanguageIdeModule()));
}
}

8
org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/xtextgrammar/ide/XtextGrammarTestLanguageIdeSetup.java
View file

@ -3,10 +3,12 @@
*/
package org.eclipse.xtext.testlanguages.xtextgrammar.ide;
import com.google.inject.Guice;
import com.google.inject.Injector;
import org.eclipse.xtext.testlanguages.xtextgrammar.XtextGrammarTestLanguageRuntimeModule;
import org.eclipse.xtext.testlanguages.xtextgrammar.XtextGrammarTestLanguageStandaloneSetup;
import org.eclipse.xtext.util.Modules2;
import com.google.inject.Guice;
import com.google.inject.Injector;
/**
* Initialization support for running Xtext languages without Equinox extension registry.
@ -15,6 +17,6 @@ public class XtextGrammarTestLanguageIdeSetup extends XtextGrammarTestLanguageSt
@Override
public Injector createInjector() {
return Guice.createInjector(new XtextGrammarTestLanguageRuntimeModule(), new XtextGrammarTestLanguageIdeModule());
return Guice.createInjector(Modules2.mixin(new XtextGrammarTestLanguageRuntimeModule(), new XtextGrammarTestLanguageIdeModule()));
}
}