diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/IndentationAwareUiTestLanguageInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/IndentationAwareUiTestLanguageInjectorProvider.java index f4dbe9600..37d9e6dc3 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/IndentationAwareUiTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/IndentationAwareUiTestLanguageInjectorProvider.java @@ -29,7 +29,6 @@ public class IndentationAwareUiTestLanguageInjectorProvider implements IInjector @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -60,11 +59,16 @@ public class IndentationAwareUiTestLanguageInjectorProvider implements IInjector @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialContentAssistTestLanguageInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialContentAssistTestLanguageInjectorProvider.java index 980eb0d79..d03bc2fe5 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialContentAssistTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialContentAssistTestLanguageInjectorProvider.java @@ -29,7 +29,6 @@ public class PartialContentAssistTestLanguageInjectorProvider implements IInject @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -60,11 +59,16 @@ public class PartialContentAssistTestLanguageInjectorProvider implements IInject @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialSerializationTestLanguageInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialSerializationTestLanguageInjectorProvider.java index 0899634a7..4602fc8da 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialSerializationTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialSerializationTestLanguageInjectorProvider.java @@ -29,7 +29,6 @@ public class PartialSerializationTestLanguageInjectorProvider implements IInject @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -60,11 +59,16 @@ public class PartialSerializationTestLanguageInjectorProvider implements IInject @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/RenameTestLanguageInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/RenameTestLanguageInjectorProvider.java index 52e93514e..38e9c2c84 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/RenameTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/RenameTestLanguageInjectorProvider.java @@ -29,7 +29,6 @@ public class RenameTestLanguageInjectorProvider implements IInjectorProvider, IR @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -60,11 +59,16 @@ public class RenameTestLanguageInjectorProvider implements IInjectorProvider, IR @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/TestLanguageInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/TestLanguageInjectorProvider.java index f58f8f86f..b694856be 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/TestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/TestLanguageInjectorProvider.java @@ -29,7 +29,6 @@ public class TestLanguageInjectorProvider implements IInjectorProvider, IRegistr @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -60,11 +59,16 @@ public class TestLanguageInjectorProvider implements IInjectorProvider, IRegistr @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/tests/FileAwareTestLanguageInjectorProvider.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/tests/FileAwareTestLanguageInjectorProvider.java index 22cc7cd9c..a9bb909cf 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/tests/FileAwareTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/tests/FileAwareTestLanguageInjectorProvider.java @@ -25,7 +25,6 @@ public class FileAwareTestLanguageInjectorProvider implements IInjectorProvider, @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class FileAwareTestLanguageInjectorProvider implements IInjectorProvider, @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/tests/XtextGrammarTestLanguageInjectorProvider.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/tests/XtextGrammarTestLanguageInjectorProvider.java index f16629eca..23ba54152 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/tests/XtextGrammarTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/tests/XtextGrammarTestLanguageInjectorProvider.java @@ -25,7 +25,6 @@ public class XtextGrammarTestLanguageInjectorProvider implements IInjectorProvid @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class XtextGrammarTestLanguageInjectorProvider implements IInjectorProvid @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/tests/FormatterTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/tests/FormatterTestLanguageInjectorProvider.java index 6ce68787a..9a364a46d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/tests/FormatterTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/tests/FormatterTestLanguageInjectorProvider.java @@ -25,7 +25,6 @@ public class FormatterTestLanguageInjectorProvider implements IInjectorProvider, @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class FormatterTestLanguageInjectorProvider implements IInjectorProvider, @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/tests/RegionAccessTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/tests/RegionAccessTestLanguageInjectorProvider.java index 84ae8ea69..39b5fe0d7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/tests/RegionAccessTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/tests/RegionAccessTestLanguageInjectorProvider.java @@ -25,7 +25,6 @@ public class RegionAccessTestLanguageInjectorProvider implements IInjectorProvid @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class RegionAccessTestLanguageInjectorProvider implements IInjectorProvid @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/tests/LazyLinkingTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/tests/LazyLinkingTestLanguageInjectorProvider.java index a1320b24d..b0d34d3ac 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/tests/LazyLinkingTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/tests/LazyLinkingTestLanguageInjectorProvider.java @@ -25,7 +25,6 @@ public class LazyLinkingTestLanguageInjectorProvider implements IInjectorProvide @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class LazyLinkingTestLanguageInjectorProvider implements IInjectorProvide @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageExInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageExInjectorProvider.java index f1cd7ba80..e1be08f24 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageExInjectorProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageExInjectorProvider.java @@ -25,7 +25,6 @@ public class FragmentTestLanguageExInjectorProvider implements IInjectorProvider @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class FragmentTestLanguageExInjectorProvider implements IInjectorProvider @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageInjectorProvider.java index 472a2ea28..a79916abc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageInjectorProvider.java @@ -25,7 +25,6 @@ public class FragmentTestLanguageInjectorProvider implements IInjectorProvider, @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class FragmentTestLanguageInjectorProvider implements IInjectorProvider, @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/tests/IndentationAwareTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/tests/IndentationAwareTestLanguageInjectorProvider.java index 351fb69e9..16791d80c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/tests/IndentationAwareTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/tests/IndentationAwareTestLanguageInjectorProvider.java @@ -25,7 +25,6 @@ public class IndentationAwareTestLanguageInjectorProvider implements IInjectorPr @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class IndentationAwareTestLanguageInjectorProvider implements IInjectorPr @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/NoParametersTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/NoParametersTestLanguageInjectorProvider.java index f6c274452..d535a2a29 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/NoParametersTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/NoParametersTestLanguageInjectorProvider.java @@ -25,7 +25,6 @@ public class NoParametersTestLanguageInjectorProvider implements IInjectorProvid @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class NoParametersTestLanguageInjectorProvider implements IInjectorProvid @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageExInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageExInjectorProvider.java index 0b1059faa..ba384f603 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageExInjectorProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageExInjectorProvider.java @@ -25,7 +25,6 @@ public class ParametersTestLanguageExInjectorProvider implements IInjectorProvid @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class ParametersTestLanguageExInjectorProvider implements IInjectorProvid @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageInjectorProvider.java index 422b3779c..4116d0cd2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageInjectorProvider.java @@ -25,7 +25,6 @@ public class ParametersTestLanguageInjectorProvider implements IInjectorProvider @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class ParametersTestLanguageInjectorProvider implements IInjectorProvider @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/TwoParametersTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/TwoParametersTestLanguageInjectorProvider.java index 4902f34ae..b9e35d9d9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/TwoParametersTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/TwoParametersTestLanguageInjectorProvider.java @@ -25,7 +25,6 @@ public class TwoParametersTestLanguageInjectorProvider implements IInjectorProvi @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class TwoParametersTestLanguageInjectorProvider implements IInjectorProvi @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java index 4cca96dea..b605cd530 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java @@ -59,7 +59,7 @@ public class SerializationErrorTestLanguageSemanticSequencer extends AbstractDel * Indent returns Indent * * Constraint: - * ((((req=TwoRequired opt=TwoOptions) | opt=TwoOptions)? indent+=Indent+) | indent+=Indent+)? + * ((req=TwoRequired? opt=TwoOptions indent+=Indent+) | (req=TwoRequired? indent+=Indent+) | indent+=Indent+)? */ protected void sequence_Indent(ISerializationContext context, Indent semanticObject) { genericSequencer.createSequence(context, semanticObject); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/tests/SequencerTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/tests/SequencerTestLanguageInjectorProvider.java index 5b6037cae..c412dca25 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/tests/SequencerTestLanguageInjectorProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/tests/SequencerTestLanguageInjectorProvider.java @@ -25,7 +25,6 @@ public class SequencerTestLanguageInjectorProvider implements IInjectorProvider, @Override public Injector getInjector() { if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); this.injector = internalCreateInjector(); stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } @@ -56,11 +55,16 @@ public class SequencerTestLanguageInjectorProvider implements IInjectorProvider, @Override public void restoreRegistry() { stateBeforeInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = null; } @Override public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + if (injector == null) { + getInjector(); + } else { + stateAfterInjectorCreation.restoreGlobalState(); + } } }