From a39ff7ece714f57dcb4a901ff7a63ecab2f6c9db Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Sat, 18 Dec 2021 09:05:52 +0100
Subject: [PATCH] [MPP][Test] Declare multiplatformAnalysisConfiguration as
 member property

^KT-50120
---
 .../frontend/classic/ClassicFrontendFacade.kt    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt
index fe0f094fa84..7d3418c5553 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt
@@ -76,18 +76,22 @@ import java.io.File
 class ClassicFrontendFacade(
     testServices: TestServices,
 ) : FrontendFacade<ClassicFrontendOutputArtifact>(testServices, FrontendKinds.ClassicFrontend) {
+
     override val additionalServices: List<ServiceRegistrationData>
         get() = listOf(service(::ModuleDescriptorProvider))
 
+    private val multiplatformAnalysisConfiguration by lazy {
+        MultiplatformAnalysisConfiguration(testServices)
+    }
+
     override fun analyze(module: TestModule): ClassicFrontendOutputArtifact {
         val moduleDescriptorProvider = testServices.moduleDescriptorProvider
         val compilerConfigurationProvider = testServices.compilerConfigurationProvider
         val packagePartProviderFactory = compilerConfigurationProvider.getPackagePartProviderFactory(module)
         val project = compilerConfigurationProvider.getProject(module)
         val configuration = compilerConfigurationProvider.getCompilerConfiguration(module)
-        val multiplatformConfiguration = MultiplatformAnalysisConfiguration(testServices)
 
-        val ktFilesMap = multiplatformConfiguration.getKtFilesForForSourceFiles(project, module)
+        val ktFilesMap = multiplatformAnalysisConfiguration.getKtFilesForForSourceFiles(project, module)
         val ktFiles = ktFilesMap.values.toList()
 
         setupJavacIfNeeded(module, ktFiles, configuration)
@@ -97,10 +101,10 @@ class ClassicFrontendFacade(
             configuration,
             packagePartProviderFactory,
             ktFiles,
-            compilerEnvironment = multiplatformConfiguration.getCompilerEnvironment(module),
-            dependencyDescriptors = multiplatformConfiguration.getDependencyDescriptors(module),
-            friendsDescriptors = multiplatformConfiguration.getFriendDescriptors(module),
-            dependsOnDescriptors = multiplatformConfiguration.getDependsOnDescriptors(module)
+            compilerEnvironment = multiplatformAnalysisConfiguration.getCompilerEnvironment(module),
+            dependencyDescriptors = multiplatformAnalysisConfiguration.getDependencyDescriptors(module),
+            friendsDescriptors = multiplatformAnalysisConfiguration.getFriendDescriptors(module),
+            dependsOnDescriptors = multiplatformAnalysisConfiguration.getDependsOnDescriptors(module)
         )
         moduleDescriptorProvider.replaceModuleDescriptorForModule(module, analysisResult.moduleDescriptor)
         return ClassicFrontendOutputArtifact(