From 5c091f611ef8f8ef1ee0bc95f4a492628d6ce159 Mon Sep 17 00:00:00 2001 From: Marco Pennekamp Date: Mon, 16 Oct 2023 20:36:00 +0200 Subject: [PATCH] [LL] Pass contextual module to stub-based Kotlin declaration providers - This will allow the Kotlin declaration provider to compute package sets based on the library module associated with the stub-based symbol provider. ^KTIJ-27411 --- .../deserialization/StubBasedFirDeserializedSymbolProvider.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 abd92020054..09d58b790ce 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 @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.stubBased.deserializatio import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.analysis.low.level.api.fir.caches.getNotNullValueForNotNullContext +import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.llFirModuleData import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.LLFirKotlinSymbolProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.util.LLFirKotlinSymbolNamesProvider import org.jetbrains.kotlin.analysis.providers.createDeclarationProvider @@ -54,7 +55,7 @@ internal open class StubBasedFirDeserializedSymbolProvider( ) : LLFirKotlinSymbolProvider(session) { private val moduleData = moduleDataProvider.getModuleData(null) - final override val declarationProvider = project.createDeclarationProvider(scope, module = null) + final override val declarationProvider = project.createDeclarationProvider(scope, session.llFirModuleData.ktModule) override val symbolNamesProvider: FirSymbolNamesProvider = LLFirKotlinSymbolNamesProvider.cached(session, declarationProvider)