From 50a160afb127c5fe30a5863ae5981d81a6f6449e Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Sun, 23 Feb 2014 12:58:15 +0400 Subject: [PATCH] Do not pass TopDownAnalysisParameters to injectors --- .../jet/di/InjectorForTopDownAnalyzerForJvm.java | 12 ++++++------ .../org/jetbrains/jet/di/InjectorForBodyResolve.java | 12 ++++++------ .../jet/di/InjectorForTopDownAnalyzerBasic.java | 12 ++++++------ .../jet/generators/injectors/GenerateInjectors.kt | 4 ++-- .../jet/di/InjectorForTopDownAnalyzerForJs.java | 12 ++++++------ 5 files changed, 26 insertions(+), 26 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 8a7f19e3ccd..0826180cf00 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; +import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; @@ -71,7 +71,7 @@ import javax.annotation.PreDestroy; public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnalyzer { private final Project project; - private final TopDownAnalysisParameters topDownAnalysisParameters; + private final GlobalContext globalContext; private final StorageManager storageManager; private final BindingTrace bindingTrace; private final ModuleDescriptorImpl moduleDescriptor; @@ -120,13 +120,13 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly public InjectorForTopDownAnalyzerForJvm( @NotNull Project project, - @NotNull TopDownAnalysisParameters topDownAnalysisParameters, + @NotNull GlobalContext globalContext, @NotNull BindingTrace bindingTrace, @NotNull ModuleDescriptorImpl moduleDescriptor ) { this.project = project; - this.topDownAnalysisParameters = topDownAnalysisParameters; - this.storageManager = topDownAnalysisParameters.getStorageManager(); + this.globalContext = globalContext; + this.storageManager = globalContext.getStorageManager(); this.bindingTrace = bindingTrace; this.moduleDescriptor = moduleDescriptor; this.platformToKotlinClassMap = moduleDescriptor.getPlatformToKotlinClassMap(); @@ -227,7 +227,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly expressionTypingComponents.setExpressionTypingServices(expressionTypingServices); expressionTypingComponents.setExpressionTypingUtils(expressionTypingUtils); expressionTypingComponents.setForLoopConventionsChecker(forLoopConventionsChecker); - expressionTypingComponents.setGlobalContext(topDownAnalysisParameters); + expressionTypingComponents.setGlobalContext(globalContext); expressionTypingComponents.setPlatformToKotlinClassMap(platformToKotlinClassMap); forLoopConventionsChecker.setExpressionTypingServices(expressionTypingServices); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java index c20d14a789b..0f9b56c3eb9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; +import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; @@ -50,7 +50,7 @@ import javax.annotation.PreDestroy; public class InjectorForBodyResolve { private final Project project; - private final TopDownAnalysisParameters topDownAnalysisParameters; + private final GlobalContext globalContext; private final StorageManager storageManager; private final BindingTrace bindingTrace; private final ModuleDescriptor moduleDescriptor; @@ -78,13 +78,13 @@ public class InjectorForBodyResolve { public InjectorForBodyResolve( @NotNull Project project, - @NotNull TopDownAnalysisParameters topDownAnalysisParameters, + @NotNull GlobalContext globalContext, @NotNull BindingTrace bindingTrace, @NotNull ModuleDescriptor moduleDescriptor ) { this.project = project; - this.topDownAnalysisParameters = topDownAnalysisParameters; - this.storageManager = topDownAnalysisParameters.getStorageManager(); + this.globalContext = globalContext; + this.storageManager = globalContext.getStorageManager(); this.bindingTrace = bindingTrace; this.moduleDescriptor = moduleDescriptor; this.platformToKotlinClassMap = moduleDescriptor.getPlatformToKotlinClassMap(); @@ -143,7 +143,7 @@ public class InjectorForBodyResolve { expressionTypingComponents.setExpressionTypingServices(expressionTypingServices); expressionTypingComponents.setExpressionTypingUtils(expressionTypingUtils); expressionTypingComponents.setForLoopConventionsChecker(forLoopConventionsChecker); - expressionTypingComponents.setGlobalContext(topDownAnalysisParameters); + expressionTypingComponents.setGlobalContext(globalContext); expressionTypingComponents.setPlatformToKotlinClassMap(platformToKotlinClassMap); forLoopConventionsChecker.setExpressionTypingServices(expressionTypingServices); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index ac5909805dd..5cb3a60e991 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; +import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; @@ -60,7 +60,7 @@ import javax.annotation.PreDestroy; public class InjectorForTopDownAnalyzerBasic { private final Project project; - private final TopDownAnalysisParameters topDownAnalysisParameters; + private final GlobalContext globalContext; private final StorageManager storageManager; private final BindingTrace bindingTrace; private final ModuleDescriptorImpl moduleDescriptor; @@ -98,13 +98,13 @@ public class InjectorForTopDownAnalyzerBasic { public InjectorForTopDownAnalyzerBasic( @NotNull Project project, - @NotNull TopDownAnalysisParameters topDownAnalysisParameters, + @NotNull GlobalContext globalContext, @NotNull BindingTrace bindingTrace, @NotNull ModuleDescriptorImpl moduleDescriptor ) { this.project = project; - this.topDownAnalysisParameters = topDownAnalysisParameters; - this.storageManager = topDownAnalysisParameters.getStorageManager(); + this.globalContext = globalContext; + this.storageManager = globalContext.getStorageManager(); this.bindingTrace = bindingTrace; this.moduleDescriptor = moduleDescriptor; this.platformToKotlinClassMap = moduleDescriptor.getPlatformToKotlinClassMap(); @@ -182,7 +182,7 @@ public class InjectorForTopDownAnalyzerBasic { expressionTypingComponents.setExpressionTypingServices(expressionTypingServices); expressionTypingComponents.setExpressionTypingUtils(expressionTypingUtils); expressionTypingComponents.setForLoopConventionsChecker(forLoopConventionsChecker); - expressionTypingComponents.setGlobalContext(topDownAnalysisParameters); + expressionTypingComponents.setGlobalContext(globalContext); expressionTypingComponents.setPlatformToKotlinClassMap(platformToKotlinClassMap); forLoopConventionsChecker.setExpressionTypingServices(expressionTypingServices); diff --git a/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt index b19862bd5c4..6968b7479a2 100644 --- a/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt +++ b/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt @@ -64,7 +64,7 @@ public fun createInjectorGenerators(): List = private fun DependencyInjectorGenerator.commonForTopDownAnalyzer() { parameter(javaClass()) - parameter(javaClass(), useAsContext = true) + parameter(javaClass(), useAsContext = true) parameter(javaClass()) publicParameter(javaClass(), useAsContext = true) @@ -192,7 +192,7 @@ private fun generatorForTests() = private fun generatorForBodyResolve() = generator("compiler/frontend/src", "org.jetbrains.jet.di", "InjectorForBodyResolve") { parameter(javaClass()) - parameter(javaClass(), useAsContext = true) + parameter(javaClass(), useAsContext = true) parameter(javaClass()) parameter(javaClass(), useAsContext = true) 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 0ea5e494aeb..524820fcd52 100644 --- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; +import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; @@ -60,7 +60,7 @@ import javax.annotation.PreDestroy; public class InjectorForTopDownAnalyzerForJs { private final Project project; - private final TopDownAnalysisParameters topDownAnalysisParameters; + private final GlobalContext globalContext; private final StorageManager storageManager; private final BindingTrace bindingTrace; private final ModuleDescriptorImpl moduleDescriptor; @@ -98,13 +98,13 @@ public class InjectorForTopDownAnalyzerForJs { public InjectorForTopDownAnalyzerForJs( @NotNull Project project, - @NotNull TopDownAnalysisParameters topDownAnalysisParameters, + @NotNull GlobalContext globalContext, @NotNull BindingTrace bindingTrace, @NotNull ModuleDescriptorImpl moduleDescriptor ) { this.project = project; - this.topDownAnalysisParameters = topDownAnalysisParameters; - this.storageManager = topDownAnalysisParameters.getStorageManager(); + this.globalContext = globalContext; + this.storageManager = globalContext.getStorageManager(); this.bindingTrace = bindingTrace; this.moduleDescriptor = moduleDescriptor; this.platformToKotlinClassMap = moduleDescriptor.getPlatformToKotlinClassMap(); @@ -182,7 +182,7 @@ public class InjectorForTopDownAnalyzerForJs { expressionTypingComponents.setExpressionTypingServices(expressionTypingServices); expressionTypingComponents.setExpressionTypingUtils(expressionTypingUtils); expressionTypingComponents.setForLoopConventionsChecker(forLoopConventionsChecker); - expressionTypingComponents.setGlobalContext(topDownAnalysisParameters); + expressionTypingComponents.setGlobalContext(globalContext); expressionTypingComponents.setPlatformToKotlinClassMap(platformToKotlinClassMap); forLoopConventionsChecker.setExpressionTypingServices(expressionTypingServices);