From 2673510e8b6d3fc1d3c70b1b6c20a27ac1b28c72 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 17 Jun 2014 16:17:19 +0400 Subject: [PATCH] Minor: do not access static method of ScriptHeaderResolver through instance Clean up after 024ed5a236e8a5a7350a52fecb6264395174fd1e --- .../jet/di/InjectorForTopDownAnalyzerForJvm.java | 13 ++++++------- .../jet/di/InjectorForTopDownAnalyzerBasic.java | 13 ++++++------- .../jet/lang/resolve/DeclarationResolver.java | 12 ++---------- .../jet/di/InjectorForTopDownAnalyzerForJs.java | 13 ++++++------- 4 files changed, 20 insertions(+), 31 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index 193881af9ef..d4285aec1fc 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -59,10 +59,10 @@ import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.jet.lang.resolve.DeclarationResolver; import org.jetbrains.jet.lang.resolve.ImportsResolver; import org.jetbrains.jet.lang.psi.JetImportsFactory; -import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; import org.jetbrains.jet.lang.resolve.OverloadResolver; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; +import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider; import org.jetbrains.jet.lang.resolve.java.lazy.GlobalJavaResolverContext; import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver; @@ -121,10 +121,10 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly private final DeclarationResolver declarationResolver; private final ImportsResolver importsResolver; private final JetImportsFactory jetImportsFactory; - private final ScriptHeaderResolver scriptHeaderResolver; private final OverloadResolver overloadResolver; private final OverrideResolver overrideResolver; private final TypeHierarchyResolver typeHierarchyResolver; + private final ScriptHeaderResolver scriptHeaderResolver; private final LazyJavaPackageFragmentProvider lazyJavaPackageFragmentProvider; private final GlobalJavaResolverContext globalJavaResolverContext; private final DeserializedDescriptorResolver deserializedDescriptorResolver; @@ -187,10 +187,10 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly this.declarationResolver = new DeclarationResolver(); this.importsResolver = new ImportsResolver(); this.jetImportsFactory = new JetImportsFactory(); - this.scriptHeaderResolver = new ScriptHeaderResolver(); this.overloadResolver = new OverloadResolver(); this.overrideResolver = new OverrideResolver(); this.typeHierarchyResolver = new TypeHierarchyResolver(); + this.scriptHeaderResolver = new ScriptHeaderResolver(); this.javaDescriptorFinder = new JavaDescriptorFinder(getJavaDescriptorResolver(), lazyJavaPackageFragmentProvider); this.annotationDescriptorDeserializer = new AnnotationDescriptorDeserializer(); this.constantDescriptorDeserializer = new ConstantDescriptorDeserializer(); @@ -300,7 +300,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly declarationResolver.setAnnotationResolver(annotationResolver); declarationResolver.setDescriptorResolver(descriptorResolver); declarationResolver.setImportsResolver(importsResolver); - declarationResolver.setScriptHeaderResolver(scriptHeaderResolver); declarationResolver.setTrace(bindingTrace); importsResolver.setImportsFactory(jetImportsFactory); @@ -310,9 +309,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly jetImportsFactory.setProject(project); - scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider); - scriptHeaderResolver.setTrace(bindingTrace); - overloadResolver.setTrace(bindingTrace); overrideResolver.setTrace(bindingTrace); @@ -323,6 +319,9 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly typeHierarchyResolver.setScriptHeaderResolver(scriptHeaderResolver); typeHierarchyResolver.setTrace(bindingTrace); + scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider); + scriptHeaderResolver.setTrace(bindingTrace); + deserializedDescriptorResolver.setContext(deserializationGlobalContextForJava); deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index 2b284bf45a6..0107ecd5373 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -49,10 +49,10 @@ import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.jet.lang.resolve.DeclarationResolver; import org.jetbrains.jet.lang.resolve.ImportsResolver; import org.jetbrains.jet.lang.psi.JetImportsFactory; -import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; import org.jetbrains.jet.lang.resolve.OverloadResolver; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; +import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -93,10 +93,10 @@ public class InjectorForTopDownAnalyzerBasic { private final DeclarationResolver declarationResolver; private final ImportsResolver importsResolver; private final JetImportsFactory jetImportsFactory; - private final ScriptHeaderResolver scriptHeaderResolver; private final OverloadResolver overloadResolver; private final OverrideResolver overrideResolver; private final TypeHierarchyResolver typeHierarchyResolver; + private final ScriptHeaderResolver scriptHeaderResolver; public InjectorForTopDownAnalyzerBasic( @NotNull Project project, @@ -137,10 +137,10 @@ public class InjectorForTopDownAnalyzerBasic { this.declarationResolver = new DeclarationResolver(); this.importsResolver = new ImportsResolver(); this.jetImportsFactory = new JetImportsFactory(); - this.scriptHeaderResolver = new ScriptHeaderResolver(); this.overloadResolver = new OverloadResolver(); this.overrideResolver = new OverrideResolver(); this.typeHierarchyResolver = new TypeHierarchyResolver(); + this.scriptHeaderResolver = new ScriptHeaderResolver(); this.topDownAnalyzer.setBodyResolver(bodyResolver); this.topDownAnalyzer.setDeclarationResolver(declarationResolver); @@ -232,7 +232,6 @@ public class InjectorForTopDownAnalyzerBasic { declarationResolver.setAnnotationResolver(annotationResolver); declarationResolver.setDescriptorResolver(descriptorResolver); declarationResolver.setImportsResolver(importsResolver); - declarationResolver.setScriptHeaderResolver(scriptHeaderResolver); declarationResolver.setTrace(bindingTrace); importsResolver.setImportsFactory(jetImportsFactory); @@ -242,9 +241,6 @@ public class InjectorForTopDownAnalyzerBasic { jetImportsFactory.setProject(project); - scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider); - scriptHeaderResolver.setTrace(bindingTrace); - overloadResolver.setTrace(bindingTrace); overrideResolver.setTrace(bindingTrace); @@ -255,6 +251,9 @@ public class InjectorForTopDownAnalyzerBasic { typeHierarchyResolver.setScriptHeaderResolver(scriptHeaderResolver); typeHierarchyResolver.setTrace(bindingTrace); + scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider); + scriptHeaderResolver.setTrace(bindingTrace); + } @PreDestroy diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java index 06af964b5d2..8527d137a00 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java @@ -45,6 +45,7 @@ import javax.inject.Inject; import java.util.*; import static org.jetbrains.jet.lang.diagnostics.Errors.REDECLARATION; +import static org.jetbrains.jet.lang.resolve.ScriptHeaderResolver.resolveScriptDeclarations; public class DeclarationResolver { @NotNull @@ -54,8 +55,6 @@ public class DeclarationResolver { @NotNull private DescriptorResolver descriptorResolver; @NotNull - private ScriptHeaderResolver scriptHeaderResolver; - @NotNull private BindingTrace trace; @@ -79,13 +78,6 @@ public class DeclarationResolver { this.trace = trace; } - // SCRIPT: inject script header resolver - @Inject - public void setScriptHeaderResolver(@NotNull ScriptHeaderResolver scriptHeaderResolver) { - this.scriptHeaderResolver = scriptHeaderResolver; - } - - public void process(@NotNull TopDownAnalysisContext c) { resolveAnnotationConstructors(c); @@ -94,7 +86,7 @@ public class DeclarationResolver { resolveFunctionAndPropertyHeaders(c); // SCRIPT: Resolve script declarations - scriptHeaderResolver.resolveScriptDeclarations(c); + resolveScriptDeclarations(c); createFunctionsForDataClasses(c); importsResolver.processMembersImports(c); diff --git a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index 5e2bdf82900..8c38049e212 100644 --- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -49,10 +49,10 @@ import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.jet.lang.resolve.DeclarationResolver; import org.jetbrains.jet.lang.resolve.ImportsResolver; import org.jetbrains.jet.lang.psi.JetImportsFactory; -import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; import org.jetbrains.jet.lang.resolve.OverloadResolver; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; +import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -93,10 +93,10 @@ public class InjectorForTopDownAnalyzerForJs { private final DeclarationResolver declarationResolver; private final ImportsResolver importsResolver; private final JetImportsFactory jetImportsFactory; - private final ScriptHeaderResolver scriptHeaderResolver; private final OverloadResolver overloadResolver; private final OverrideResolver overrideResolver; private final TypeHierarchyResolver typeHierarchyResolver; + private final ScriptHeaderResolver scriptHeaderResolver; public InjectorForTopDownAnalyzerForJs( @NotNull Project project, @@ -137,10 +137,10 @@ public class InjectorForTopDownAnalyzerForJs { this.declarationResolver = new DeclarationResolver(); this.importsResolver = new ImportsResolver(); this.jetImportsFactory = new JetImportsFactory(); - this.scriptHeaderResolver = new ScriptHeaderResolver(); this.overloadResolver = new OverloadResolver(); this.overrideResolver = new OverrideResolver(); this.typeHierarchyResolver = new TypeHierarchyResolver(); + this.scriptHeaderResolver = new ScriptHeaderResolver(); this.topDownAnalyzer.setBodyResolver(bodyResolver); this.topDownAnalyzer.setDeclarationResolver(declarationResolver); @@ -232,7 +232,6 @@ public class InjectorForTopDownAnalyzerForJs { declarationResolver.setAnnotationResolver(annotationResolver); declarationResolver.setDescriptorResolver(descriptorResolver); declarationResolver.setImportsResolver(importsResolver); - declarationResolver.setScriptHeaderResolver(scriptHeaderResolver); declarationResolver.setTrace(bindingTrace); importsResolver.setImportsFactory(jetImportsFactory); @@ -242,9 +241,6 @@ public class InjectorForTopDownAnalyzerForJs { jetImportsFactory.setProject(project); - scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider); - scriptHeaderResolver.setTrace(bindingTrace); - overloadResolver.setTrace(bindingTrace); overrideResolver.setTrace(bindingTrace); @@ -255,6 +251,9 @@ public class InjectorForTopDownAnalyzerForJs { typeHierarchyResolver.setScriptHeaderResolver(scriptHeaderResolver); typeHierarchyResolver.setTrace(bindingTrace); + scriptHeaderResolver.setPackageFragmentProvider(mutablePackageFragmentProvider); + scriptHeaderResolver.setTrace(bindingTrace); + } @PreDestroy