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

Merge pull request #1114 from eclipse/sz_issue734

Browse source 
[#403] Fixed regression in injector provider
This commit is contained in:
Sebastian Zarnekow 2019-04-04 23:34:43 +02:00 committed by GitHub
commit d91faabd5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 22 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/IndentationAwareUiTestLanguageInjectorProvider.java
View file

@ -67,8 +67,7 @@ public class IndentationAwareUiTestLanguageInjectorProvider implements IInjector
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialContentAssistTestLanguageInjectorProvider.java
View file

@ -67,8 +67,7 @@ public class PartialContentAssistTestLanguageInjectorProvider implements IInject
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialSerializationTestLanguageInjectorProvider.java
View file

@ -67,8 +67,7 @@ public class PartialSerializationTestLanguageInjectorProvider implements IInject
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/RenameTestLanguageInjectorProvider.java
View file

@ -67,8 +67,7 @@ public class RenameTestLanguageInjectorProvider implements IInjectorProvider, IR
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/TestLanguageInjectorProvider.java
View file

@ -67,8 +67,7 @@ public class TestLanguageInjectorProvider implements IInjectorProvider, IRegistr
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/tests/FileAwareTestLanguageInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class FileAwareTestLanguageInjectorProvider implements IInjectorProvider,
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/tests/XtextGrammarTestLanguageInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class XtextGrammarTestLanguageInjectorProvider implements IInjectorProvid
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/tests/FormatterTestLanguageInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class FormatterTestLanguageInjectorProvider implements IInjectorProvider,
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/tests/RegionAccessTestLanguageInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class RegionAccessTestLanguageInjectorProvider implements IInjectorProvid
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/tests/LazyLinkingTestLanguageInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class LazyLinkingTestLanguageInjectorProvider implements IInjectorProvide
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageExInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class FragmentTestLanguageExInjectorProvider implements IInjectorProvider
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class FragmentTestLanguageInjectorProvider implements IInjectorProvider,
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/tests/IndentationAwareTestLanguageInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class IndentationAwareTestLanguageInjectorProvider implements IInjectorPr
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/NoParametersTestLanguageInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class NoParametersTestLanguageInjectorProvider implements IInjectorProvid
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageExInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class ParametersTestLanguageExInjectorProvider implements IInjectorProvid
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class ParametersTestLanguageInjectorProvider implements IInjectorProvider
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/TwoParametersTestLanguageInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class TwoParametersTestLanguageInjectorProvider implements IInjectorProvi
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/tests/SequencerTestLanguageInjectorProvider.java
View file

@ -63,8 +63,7 @@ public class SequencerTestLanguageInjectorProvider implements IInjectorProvider,
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/XtextInjectorProvider.java
View file

@ -41,8 +41,7 @@ public class XtextInjectorProvider implements IInjectorProvider, IRegistryConfig
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}

3
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend
View file

@ -210,9 +210,8 @@ class JUnitFragment extends AbstractStubGeneratingFragment {
stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
if (injector == null) {
getInjector();
} else {
stateAfterInjectorCreation.restoreGlobalState();
}
stateAfterInjectorCreation.restoreGlobalState();
}
}
'''

7
org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java
View file

@ -513,13 +513,10 @@ public class JUnitFragment extends AbstractStubGeneratingFragment {
_builder.append("getInjector();");
_builder.newLine();
_builder.append("\t\t");
_builder.append("} else {");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("stateAfterInjectorCreation.restoreGlobalState();");
_builder.append("}");
_builder.newLine();
_builder.append("\t\t");
_builder.append("}");
_builder.append("stateAfterInjectorCreation.restoreGlobalState();");
_builder.newLine();
_builder.append("\t");
_builder.append("}");