From 89603327c519bcbdfde2fbefb37b9f3ad5b246db Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Wed, 13 Mar 2019 10:57:36 +0300
Subject: [PATCH] [Injection] Minor: inline createLazyResolveSession

---
 .../jetbrains/kotlin/frontend/di/injection.kt | 17 +----------
 .../types/DefaultModalityModifiersTest.java   | 30 ++++++++++++++-----
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
index 83056d28703..e0184ab26c8 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
@@ -17,11 +17,8 @@
 package org.jetbrains.kotlin.frontend.di
 
 import org.jetbrains.kotlin.platform.TargetPlatform
-import org.jetbrains.kotlin.analyzer.common.CommonPlatformCompilerServices
 import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
 import org.jetbrains.kotlin.container.StorageComponentContainer
-import org.jetbrains.kotlin.container.get
 import org.jetbrains.kotlin.container.useImpl
 import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.context.ModuleContext
@@ -177,16 +174,4 @@ fun createContainerForLazyResolve(
     useImpl<ResolveSession>()
     useImpl<LazyTopDownAnalyzer>()
     useImpl<SubstitutingScopeProviderImpl>()
-}
-
-// TODO: remove it
-fun createLazyResolveSession(moduleContext: ModuleContext, files: Collection<KtFile>): ResolveSession =
-    createContainerForLazyResolve(
-        moduleContext,
-        FileBasedDeclarationProviderFactory(moduleContext.storageManager, files),
-        BindingTraceContext(),
-        DefaultBuiltInPlatforms.commonPlatform,
-        CommonPlatformCompilerServices,
-        CompilerEnvironment,
-        LanguageVersionSettingsImpl.DEFAULT
-    ).get<ResolveSession>()
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java
index 972f3f03b98..99022a41d07 100644
--- a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java
@@ -19,19 +19,24 @@ package org.jetbrains.kotlin.types;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.analyzer.AnalysisResult;
+import org.jetbrains.kotlin.analyzer.common.CommonPlatformCompilerServices;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
+import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl;
+import org.jetbrains.kotlin.container.DslKt;
+import org.jetbrains.kotlin.container.StorageComponentContainer;
 import org.jetbrains.kotlin.context.ContextKt;
+import org.jetbrains.kotlin.context.ModuleContext;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation;
+import org.jetbrains.kotlin.platform.CommonPlatforms;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.kotlin.resolve.BindingContext;
-import org.jetbrains.kotlin.resolve.DescriptorResolver;
-import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver;
+import org.jetbrains.kotlin.resolve.*;
 import org.jetbrains.kotlin.resolve.calls.components.InferenceSession;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfoFactory;
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession;
+import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory;
 import org.jetbrains.kotlin.resolve.scopes.*;
 import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt;
 import org.jetbrains.kotlin.test.ConfigurationKind;
@@ -40,10 +45,11 @@ import org.jetbrains.kotlin.test.KotlinTestWithEnvironment;
 import org.jetbrains.kotlin.tests.di.ContainerForTests;
 import org.jetbrains.kotlin.tests.di.InjectionKt;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.kotlin.frontend.di.InjectionKt.createLazyResolveSession;
+import static org.jetbrains.kotlin.frontend.di.InjectionKt.createContainerForLazyResolve;
 
 public class DefaultModalityModifiersTest extends KotlinTestWithEnvironment {
     private final DefaultModalityModifiersTestCase tc = new DefaultModalityModifiersTestCase();
@@ -103,11 +109,21 @@ public class DefaultModalityModifiersTest extends KotlinTestWithEnvironment {
         }
 
         private ClassDescriptorWithResolutionScopes createClassDescriptor(ClassKind kind, KtClass aClass) {
-            ResolveSession resolveSession = createLazyResolveSession(
-                    ContextKt.ModuleContext(root, getProject()),
-                    Collections.singleton(aClass.getContainingKtFile())
+            ModuleContext moduleContext = ContextKt.ModuleContext(root, getProject());
+            Collection<KtFile> files = Collections.singleton(aClass.getContainingKtFile());
+
+            StorageComponentContainer container = createContainerForLazyResolve(
+                    moduleContext,
+                    new FileBasedDeclarationProviderFactory(moduleContext.getStorageManager(), files),
+                    new BindingTraceContext(),
+                    CommonPlatforms.INSTANCE.getDefaultCommonPlatform(),
+                    CommonPlatformCompilerServices.INSTANCE,
+                    CompilerEnvironment.INSTANCE,
+                    LanguageVersionSettingsImpl.DEFAULT
             );
 
+            ResolveSession resolveSession = DslKt.getService(container, ResolveSession.class);
+
             return (ClassDescriptorWithResolutionScopes) resolveSession.getClassDescriptor(aClass, NoLookupLocation.FROM_TEST);
         }