diff --git a/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/importHandling/ImportTestHelper.xtend b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/importHandling/ImportTestHelper.xtend index ed3542c2f..59fc41804 100644 --- a/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/importHandling/ImportTestHelper.xtend +++ b/org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/importHandling/ImportTestHelper.xtend @@ -22,12 +22,14 @@ import org.eclipse.xtext.ide.serializer.impl.TextDocumentChange import org.eclipse.xtext.resource.IResourceDescription import org.eclipse.xtext.resource.XtextResource import org.eclipse.xtext.resource.XtextResourceSet +import org.eclipse.xtext.resource.impl.ChunkedResourceDescriptions import org.eclipse.xtext.resource.impl.ResourceDescriptionsData import org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider import org.eclipse.xtext.testing.util.InMemoryURIHandler import org.eclipse.xtext.testing.validation.ValidationTestHelper import org.eclipse.xtext.util.CollectionBasedAcceptor import org.junit.Assert + import static extension org.eclipse.xtext.util.Strings.* /** @@ -70,6 +72,7 @@ class ImportTestHelper { r.getLoadOptions().put(ResourceDescriptionsProvider.LIVE_SCOPE, Boolean.TRUE); r.getURIConverter.getURIHandlers.add(0, fs) ResourceDescriptionsData.ResourceSetAdapter.installResourceDescriptionsData(r, data) + new ChunkedResourceDescriptions(#{"egal"->data}, r) return r; } diff --git a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/PartialContentAssistTestLanguageIdeInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/PartialContentAssistTestLanguageIdeInjectorProvider.java index 3414916ca..e27471107 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/PartialContentAssistTestLanguageIdeInjectorProvider.java +++ b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/PartialContentAssistTestLanguageIdeInjectorProvider.java @@ -9,6 +9,7 @@ package org.eclipse.xtext.ide.tests.testlanguage; import org.eclipse.xtext.ide.tests.testlanguage.ide.PartialContentAssistTestLanguageIdeModule; import org.eclipse.xtext.ide.tests.testlanguage.tests.PartialContentAssistTestLanguageInjectorProvider; +import org.eclipse.xtext.util.Modules2; import com.google.inject.Guice; import com.google.inject.Injector; @@ -23,7 +24,7 @@ public class PartialContentAssistTestLanguageIdeInjectorProvider return new TestLanguageStandaloneSetup() { @Override public Injector createInjector() { - return Guice.createInjector(createRuntimeModule(), new PartialContentAssistTestLanguageIdeModule()); + return Guice.createInjector(Modules2.mixin(createRuntimeModule(), new PartialContentAssistTestLanguageIdeModule())); } }.createInjectorAndDoEMFRegistration(); } diff --git a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageIdeInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageIdeInjectorProvider.java index a51090db0..48cdf5fcd 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageIdeInjectorProvider.java +++ b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguageIdeInjectorProvider.java @@ -9,6 +9,7 @@ package org.eclipse.xtext.ide.tests.testlanguage; import org.eclipse.xtext.ide.tests.testlanguage.ide.TestLanguageIdeModule; import org.eclipse.xtext.ide.tests.testlanguage.tests.TestLanguageInjectorProvider; +import org.eclipse.xtext.util.Modules2; import com.google.inject.Guice; import com.google.inject.Injector; @@ -22,7 +23,7 @@ public class TestLanguageIdeInjectorProvider extends TestLanguageInjectorProvide return new TestLanguageStandaloneSetup() { @Override public Injector createInjector() { - return Guice.createInjector(createRuntimeModule(), new TestLanguageIdeModule()); + return Guice.createInjector(Modules2.mixin(createRuntimeModule(), new TestLanguageIdeModule())); } }.createInjectorAndDoEMFRegistration(); diff --git a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/importHandling/ImportTestHelper.java b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/importHandling/ImportTestHelper.java index 5d67fc337..08b180088 100644 --- a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/importHandling/ImportTestHelper.java +++ b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/importHandling/ImportTestHelper.java @@ -12,6 +12,7 @@ import com.google.common.collect.Iterables; import com.google.inject.Inject; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.function.Consumer; import org.eclipse.emf.common.util.URI; @@ -27,6 +28,7 @@ import org.eclipse.xtext.ide.serializer.impl.TextDocumentChange; import org.eclipse.xtext.resource.IResourceDescription; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; +import org.eclipse.xtext.resource.impl.ChunkedResourceDescriptions; import org.eclipse.xtext.resource.impl.ResourceDescriptionsData; import org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider; import org.eclipse.xtext.testing.util.InMemoryURIHandler; @@ -90,6 +92,8 @@ public class ImportTestHelper { r.getLoadOptions().put(ResourceDescriptionsProvider.LIVE_SCOPE, Boolean.TRUE); r.getURIConverter().getURIHandlers().add(0, fs); ResourceDescriptionsData.ResourceSetAdapter.installResourceDescriptionsData(r, data); + Pair _mappedTo = Pair.of("egal", data); + new ChunkedResourceDescriptions(Collections.unmodifiableMap(CollectionLiterals.newHashMap(_mappedTo)), r); return r; } diff --git a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/xtextgrammar/ide/XtextGrammarTestLanguageIdeInjectorProvider.java b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/xtextgrammar/ide/XtextGrammarTestLanguageIdeInjectorProvider.java index 11541c2fc..8607ff35d 100644 --- a/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/xtextgrammar/ide/XtextGrammarTestLanguageIdeInjectorProvider.java +++ b/org.eclipse.xtext.testlanguages.ide/src/org/eclipse/xtext/testlanguages/xtextgrammar/ide/XtextGrammarTestLanguageIdeInjectorProvider.java @@ -9,6 +9,7 @@ package org.eclipse.xtext.testlanguages.xtextgrammar.ide; import org.eclipse.xtext.testlanguages.xtextgrammar.XtextGrammarTestLanguageStandaloneSetup; import org.eclipse.xtext.testlanguages.xtextgrammar.tests.XtextGrammarTestLanguageInjectorProvider; +import org.eclipse.xtext.util.Modules2; import com.google.inject.Guice; import com.google.inject.Injector; @@ -23,7 +24,7 @@ public class XtextGrammarTestLanguageIdeInjectorProvider extends XtextGrammarTes return new XtextGrammarTestLanguageStandaloneSetup() { @Override public Injector createInjector() { - return Guice.createInjector(createRuntimeModule(), createIdeModule()); + return Guice.createInjector(Modules2.mixin(createRuntimeModule(), createIdeModule())); } private XtextGrammarTestLanguageIdeModule createIdeModule() {