From 16214e01d14985845cd39dbe8e42d18028802a05 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 18 May 2023 16:54:40 +0200 Subject: [PATCH] [LL FIR] do not process member declarations during expect-actual phase ^KT-56551 --- .../transformers/LLFirExpectActualMatcherLazyResolver.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirExpectActualMatcherLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirExpectActualMatcherLazyResolver.kt index 2d7dc2fc454..79ea0f81197 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirExpectActualMatcherLazyResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirExpectActualMatcherLazyResolver.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkPhase import org.jetbrains.kotlin.fir.FirElementWithResolveState import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirTowerDataContextCollector import org.jetbrains.kotlin.fir.resolve.transformers.mpp.FirExpectActualMatcherTransformer @@ -45,7 +46,12 @@ private class LLFirExpectActualMatchingTargetResolver( session: FirSession, scopeSession: ScopeSession, ) : LLFirTargetResolver(target, lockProvider, FirResolvePhase.EXPECT_ACTUAL_MATCHING) { - private val transformer = FirExpectActualMatcherTransformer(session, scopeSession) + private val transformer = object : FirExpectActualMatcherTransformer(session, scopeSession) { + override fun transformRegularClass(regularClass: FirRegularClass, data: Nothing?): FirStatement { + transformMemberDeclaration(regularClass) + return regularClass + } + } override fun withFile(firFile: FirFile, action: () -> Unit) { action()