From 5b762606fe97022cf0567c626ed0dda0a0747482 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 3 Sep 2019 19:15:07 +0200 Subject: [PATCH 1/2] make sure WithTransient Package is always registered Signed-off-by: Christian Dietrich --- ...SerializationTestLanguageStandaloneSetup.xtend | 13 +++++++++++++ ...lSerializationTestLanguageStandaloneSetup.java | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/PartialSerializationTestLanguageStandaloneSetup.xtend b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/PartialSerializationTestLanguageStandaloneSetup.xtend index 97df2715f..2258357b5 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/PartialSerializationTestLanguageStandaloneSetup.xtend +++ b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/PartialSerializationTestLanguageStandaloneSetup.xtend @@ -7,6 +7,9 @@ */ package org.eclipse.xtext.ide.tests.testlanguage +import com.google.inject.Injector +import org.eclipse.emf.ecore.EPackage +import org.eclipse.xtext.ide.tests.testlanguage.withtransient.WithtransientPackage /** * Initialization support for running Xtext languages without Equinox extension registry. @@ -16,4 +19,14 @@ class PartialSerializationTestLanguageStandaloneSetup extends PartialSerializati def static void doSetup() { new PartialSerializationTestLanguageStandaloneSetup().createInjectorAndDoEMFRegistration() } + + override register(Injector injector) { + super.register(injector) + if (!EPackage.Registry.INSTANCE.containsKey( + "http://www.eclipse.org/xtext/ide/tests/testlanguage/mm/withtransient")) { + EPackage.Registry.INSTANCE.put("http://www.eclipse.org/xtext/ide/tests/testlanguage/mm/withtransient", + WithtransientPackage.eINSTANCE); + } + } + } diff --git a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/PartialSerializationTestLanguageStandaloneSetup.java b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/PartialSerializationTestLanguageStandaloneSetup.java index d2a7e936e..adff3cbca 100644 --- a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/PartialSerializationTestLanguageStandaloneSetup.java +++ b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/PartialSerializationTestLanguageStandaloneSetup.java @@ -7,7 +7,10 @@ */ package org.eclipse.xtext.ide.tests.testlanguage; +import com.google.inject.Injector; +import org.eclipse.emf.ecore.EPackage; import org.eclipse.xtext.ide.tests.testlanguage.PartialSerializationTestLanguageStandaloneSetupGenerated; +import org.eclipse.xtext.ide.tests.testlanguage.withtransient.WithtransientPackage; /** * Initialization support for running Xtext languages without Equinox extension registry. @@ -17,4 +20,16 @@ public class PartialSerializationTestLanguageStandaloneSetup extends PartialSeri public static void doSetup() { new PartialSerializationTestLanguageStandaloneSetup().createInjectorAndDoEMFRegistration(); } + + @Override + public void register(final Injector injector) { + super.register(injector); + boolean _containsKey = EPackage.Registry.INSTANCE.containsKey( + "http://www.eclipse.org/xtext/ide/tests/testlanguage/mm/withtransient"); + boolean _not = (!_containsKey); + if (_not) { + EPackage.Registry.INSTANCE.put("http://www.eclipse.org/xtext/ide/tests/testlanguage/mm/withtransient", + WithtransientPackage.eINSTANCE); + } + } } From a772c3771861c18daeb845412395975ed14fb36c Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 3 Sep 2019 18:33:24 +0200 Subject: [PATCH 2/2] [eclipse/xtext#1537] bootstrap against 2.19.0 Signed-off-by: Christian Dietrich --- gradle/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 97e5128f5..9626795ba 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -6,7 +6,7 @@ version = '2.20.0-SNAPSHOT' ext.versions = [ 'xtext': version, - 'xtext_bootstrap': '2.19.0.M3', + 'xtext_bootstrap': '2.19.0', 'gradle_plugins': '0.1.0', 'xtext_gradle_plugin': '2.0.7', 'dependency_management_plugin' : '1.0.8.RELEASE'