From 70be224f0fc01c05d4f89711d506d1675520c61e Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Wed, 13 Mar 2019 10:00:12 +0300
Subject: [PATCH] [Injection] Minor: inline configureJavaTopDownAnalysis

It was used called only once, and hasn't provided any useful
abstraction.

Actually, this "cosmetic" refactoring makes similarities with other
platform-specific container set-ups cleare, which allows to make further
generalizations and simplifications.
---
 .../kotlin/frontend/java/di/injection.kt      | 46 +++++++------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt
index a7ca7e75b2c..6c0ecc1f3db 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.frontend.java.di
 
-import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns
 import org.jetbrains.kotlin.builtins.jvm.JvmBuiltInsPackageFragmentProvider
@@ -49,34 +48,6 @@ import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
 import org.jetbrains.kotlin.types.SubstitutingScopeProviderImpl
 
-private fun StorageComponentContainer.configureJavaTopDownAnalysis(
-    moduleContentScope: GlobalSearchScope,
-    project: Project,
-    lookupTracker: LookupTracker,
-    expectActualTracker: ExpectActualTracker
-) {
-    useInstance(moduleContentScope)
-    useInstance(lookupTracker)
-    useInstance(expectActualTracker)
-    useImpl<ResolveSession>()
-
-    useImpl<LazyTopDownAnalyzer>()
-    useImpl<JavaDescriptorResolver>()
-    useImpl<DeserializationComponentsForJava>()
-
-    useInstance(VirtualFileFinderFactory.getInstance(project).create(moduleContentScope))
-
-    useInstance(JavaPropertyInitializerEvaluatorImpl)
-    useImpl<AnnotationResolverImpl>()
-    useImpl<SignaturePropagatorImpl>()
-    useImpl<TraceBasedErrorReporter>()
-    useInstance(InternalFlexibleTypeTransformer)
-
-    useImpl<CompilerDeserializationConfiguration>()
-
-    useInstance(JavaDeprecationSettings)
-}
-
 fun createContainerForLazyResolveWithJava(
     jvmPlatform: TargetPlatform,
     moduleContext: ModuleContext,
@@ -94,7 +65,22 @@ fun createContainerForLazyResolveWithJava(
     javaClassTracker: JavaClassesTracker? = null
 ): StorageComponentContainer = createContainer("LazyResolveWithJava", JvmPlatformCompilerServices) {
     configureModule(moduleContext, jvmPlatform, JvmPlatformCompilerServices, bindingTrace)
-    configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project, lookupTracker, expectActualTracker)
+
+    useInstance(moduleContentScope)
+    useInstance(lookupTracker)
+    useInstance(expectActualTracker)
+    useImpl<ResolveSession>()
+    useImpl<LazyTopDownAnalyzer>()
+    useImpl<JavaDescriptorResolver>()
+    useImpl<DeserializationComponentsForJava>()
+    useInstance(VirtualFileFinderFactory.getInstance(moduleContext.project).create(moduleContentScope))
+    useInstance(JavaPropertyInitializerEvaluatorImpl)
+    useImpl<AnnotationResolverImpl>()
+    useImpl<SignaturePropagatorImpl>()
+    useImpl<TraceBasedErrorReporter>()
+    useInstance(InternalFlexibleTypeTransformer)
+    useImpl<CompilerDeserializationConfiguration>()
+    useInstance(JavaDeprecationSettings)
 
     if (configureJavaClassFinder != null) {
         configureJavaClassFinder()