From 66e4d5664aa078acd81d8cd9f1d8846f3a29bc03 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 9 Apr 2021 16:01:11 +0300 Subject: [PATCH] [Test] Properly setup `KtFile.isCommonSource` in tests --- .../kotlin/test/frontend/classic/ClassicFrontendFacade.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 077820ec3d2..6df7cc09388 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 @@ -47,6 +47,7 @@ import org.jetbrains.kotlin.resolve.TopDownAnalysisMode import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory +import org.jetbrains.kotlin.resolve.multiplatform.isCommonSource import org.jetbrains.kotlin.serialization.deserialization.MetadataPartProvider import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives @@ -95,7 +96,9 @@ class ClassicFrontendFacade( * We need create KtFiles again with new project because otherwise we can access to some caches using * old project as key which may leads to missing services in core environment */ - ktFilesMap.putAll(testServices.sourceFileProvider.getKtFilesForSourceFiles(artifact.allKtFiles.keys, project)) + val ktFiles = testServices.sourceFileProvider.getKtFilesForSourceFiles(artifact.allKtFiles.keys, project) + ktFiles.values.forEach { ktFile -> ktFile.isCommonSource = true } + ktFilesMap.putAll(ktFiles) hasCommonModules = true } }