From 9b82ff7a8d24082052b193800f8a95bb4e8606c6 Mon Sep 17 00:00:00 2001 From: Pavel Kirpichenkov Date: Thu, 13 Jul 2023 20:25:25 +0300 Subject: [PATCH] [LL] Don't filter out metadata declaration from stub symbol provider Now the stub-based symbol provider is reused for common source sets, which use metadata dependencies. Filtering should be done on scope level, then declaration provider won't yield them in the first place. KT-58769 --- .../StubBasedFirDeserializedSymbolProvider.kt | 5 ----- .../diagnostics/testsWithStdLib/multiplatform/collections.kt | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedFirDeserializedSymbolProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedFirDeserializedSymbolProvider.kt index 94c6f9d39ff..0d60a76686c 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedFirDeserializedSymbolProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedFirDeserializedSymbolProvider.kt @@ -141,11 +141,6 @@ internal open class StubBasedFirDeserializedSymbolProvider( return ArrayList(topLevelFunctions.size).apply { for (function in topLevelFunctions) { - val file = function.containingKtFile - if (file.virtualFile.extension == MetadataPackageFragment.METADATA_FILE_EXTENSION) { - continue - } - val functionStub = function.stub as? KotlinFunctionStubImpl ?: loadStubByElement(function) val containerSource = getFacadeContainerSource(function.containingKtFile, functionStub?.origin) diff --git a/compiler/testData/diagnostics/testsWithStdLib/multiplatform/collections.kt b/compiler/testData/diagnostics/testsWithStdLib/multiplatform/collections.kt index 3dd40fe2ca8..b5964979047 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/multiplatform/collections.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/multiplatform/collections.kt @@ -5,10 +5,10 @@ // FILE: common.kt // TARGET_PLATFORM: Common -import kotlin.collections.listOf +import kotlin.collections.listOf fun common() { - listOf("foo", "bar").map { it } + listOf("foo", "bar").map { it } } // MODULE: jvm