| commit | 71760ce302a4ac7102db7987080a8f732cf8ec70 | [log] [tgz] |
|---|---|---|
| author | Ilya Kirillov <ilya.kirillov@jetbrains.com> | Mon Jun 24 13:41:10 2024 +0200 |
| committer | Ilya Kirillov <ilya.kirillov@jetbrains.com> | Mon Jun 24 13:41:10 2024 +0200 |
| tree | cef3f1565768d2844b84217840543015ff332f81 | |
| parent | 937fb14d9b9efb7db25f5aff89099a571c90acd8 [diff] |
[LL FIR] fix resolve tests with builtin module as use-site As builtins now are not considered binary modules (KT-68462), the check in `AnalysisApiBaseTestServiceRegistrar.registerProjectModelServices` was failing. KT-68689 KT-69367
diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt index a58b7ad..e69469c 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt
@@ -91,7 +91,11 @@ // additionally build and index stubs for the library. val mainBinaryModules = moduleStructure.mainModules .filter { it.moduleKind == TestModuleKind.LibraryBinary } - .map { it.ktModule as KaLibraryModule } + .mapNotNull { + // Builtins have `TestModuleKind.LibraryBinary` but `KaBuiltinsModule` + // See KT-69367, builtins should probably be handled another way + it.ktModule as? KaLibraryModule + } val sharedBinaryDependencies = moduleStructure.binaryModules.toMutableSet() for (mainModule in moduleStructure.mainModules) {
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiBuiltinsBinaryTestConfigurator.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiBuiltinsBinaryTestConfigurator.kt index c1197cb..775f4c1 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiBuiltinsBinaryTestConfigurator.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiBuiltinsBinaryTestConfigurator.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.analysis.decompiler.psi.BuiltinsVirtualFileProvider import org.jetbrains.kotlin.analysis.test.framework.projectStructure.KtTestModule import org.jetbrains.kotlin.analysis.test.framework.projectStructure.KtTestModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import java.nio.file.Path