azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MPP][Test] Declare multiplatformAnalysisConfiguration as member property

Browse Source 
^KT-50120
This commit is contained in:
sebastian.sellmair
2021-12-18 09:05:52 +01:00
committed by Space
parent 54ab133a75
commit a39ff7ece7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt
+10 -6
View File
@@ -76,18 +76,22 @@ import java.io.File
class ClassicFrontendFacade( class ClassicFrontendFacade(
testServices: TestServices, testServices: TestServices,
) : FrontendFacade<ClassicFrontendOutputArtifact>(testServices, FrontendKinds.ClassicFrontend) { ) : FrontendFacade<ClassicFrontendOutputArtifact>(testServices, FrontendKinds.ClassicFrontend) {
override val additionalServices: List<ServiceRegistrationData> override val additionalServices: List<ServiceRegistrationData>
get() = listOf(service(::ModuleDescriptorProvider)) get() = listOf(service(::ModuleDescriptorProvider))
private val multiplatformAnalysisConfiguration by lazy {
MultiplatformAnalysisConfiguration(testServices)
}
override fun analyze(module: TestModule): ClassicFrontendOutputArtifact { override fun analyze(module: TestModule): ClassicFrontendOutputArtifact {
val moduleDescriptorProvider = testServices.moduleDescriptorProvider val moduleDescriptorProvider = testServices.moduleDescriptorProvider
val compilerConfigurationProvider = testServices.compilerConfigurationProvider val compilerConfigurationProvider = testServices.compilerConfigurationProvider
val packagePartProviderFactory = compilerConfigurationProvider.getPackagePartProviderFactory(module) val packagePartProviderFactory = compilerConfigurationProvider.getPackagePartProviderFactory(module)
val project = compilerConfigurationProvider.getProject(module) val project = compilerConfigurationProvider.getProject(module)
val configuration = compilerConfigurationProvider.getCompilerConfiguration(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() val ktFiles = ktFilesMap.values.toList()
setupJavacIfNeeded(module, ktFiles, configuration) setupJavacIfNeeded(module, ktFiles, configuration)
@@ -97,10 +101,10 @@ class ClassicFrontendFacade(
configuration, configuration,
packagePartProviderFactory, packagePartProviderFactory,
ktFiles, ktFiles,
compilerEnvironment = multiplatformConfiguration.getCompilerEnvironment(module), compilerEnvironment = multiplatformAnalysisConfiguration.getCompilerEnvironment(module),
dependencyDescriptors = multiplatformConfiguration.getDependencyDescriptors(module), dependencyDescriptors = multiplatformAnalysisConfiguration.getDependencyDescriptors(module),
friendsDescriptors = multiplatformConfiguration.getFriendDescriptors(module), friendsDescriptors = multiplatformAnalysisConfiguration.getFriendDescriptors(module),
dependsOnDescriptors = multiplatformConfiguration.getDependsOnDescriptors(module) dependsOnDescriptors = multiplatformAnalysisConfiguration.getDependsOnDescriptors(module)
) )
moduleDescriptorProvider.replaceModuleDescriptorForModule(module, analysisResult.moduleDescriptor) moduleDescriptorProvider.replaceModuleDescriptorForModule(module, analysisResult.moduleDescriptor)
return ClassicFrontendOutputArtifact( return ClassicFrontendOutputArtifact(