[AA] getExpectForActual analysis-api now returns compatible or weakly incompatible

^KTIJ-27522 Fixed

It's the only reasonable behavior for this API in it's current shape
(when it returns a list of declarations)

It's a common mistake to take only Compatible from
expectActualMatchingMap. The problem will be gone after I fix KT-62590

Motivation to fix this bug, is because it will be easier for me to split
expect-actual matcher-checker-monster thing KT-62590

Review: https://jetbrains.team/p/kt/reviews/12750/timeline
This commit is contained in:
Nikita Bobko
2023-10-25 23:12:19 +02:00
committed by teamcity
parent 69c209874d
commit e778ddfd21
9 changed files with 53 additions and 11 deletions
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.descriptors.MemberDescriptor
import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver
import org.jetbrains.kotlin.resolve.multiplatform.K1ExpectActualCompatibility
import org.jetbrains.kotlin.resolve.multiplatform.isCompatibleOrWeaklyIncompatible
internal class KtFe10MultiplatformInfoProvider(
override val analysisSession: KtFe10AnalysisSession,
@@ -25,11 +25,10 @@ internal class KtFe10MultiplatformInfoProvider(
if (actual.psiSafe<KtDeclaration>()?.hasActualModifier() != true) return emptyList()
val memberDescriptor = (getSymbolDescriptor(actual) as? MemberDescriptor)?.takeIf { it.isActual } ?: return emptyList()
val expectedCompatibilityMap =
ExpectedActualResolver.findExpectedForActual(memberDescriptor) ?: return emptyList()
val expectsForActual = (expectedCompatibilityMap[K1ExpectActualCompatibility.Compatible]
?: expectedCompatibilityMap.values.flatten())
return expectsForActual.map { it.toKtSymbol(analysisContext) as KtDeclarationSymbol }
return ExpectedActualResolver.findExpectedForActual(memberDescriptor).orEmpty().asSequence()
.filter { it.key.isCompatibleOrWeaklyIncompatible }
.flatMap { it.value }
.map { it.toKtSymbol(analysisContext) as KtDeclarationSymbol }
.toList()
}
}
@@ -52,6 +52,12 @@ public class Fe10IdeNormalAnalysisSourceModuleExpectForActualTestGenerated exten
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@Test
@TestMetadata("matchingButIncompatibleExpect.kt")
public void testMatchingButIncompatibleExpect() throws Exception {
runTest("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.kt");
}
@Test
@TestMetadata("multipleExpects.kt")
public void testMultipleExpects() throws Exception {
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.declarations.expectForActual
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
import org.jetbrains.kotlin.resolve.multiplatform.ExpectActualCompatibility
import org.jetbrains.kotlin.resolve.multiplatform.isCompatibleOrWeaklyIncompatible
internal class KtFirMultiplatformInfoProvider(
override val analysisSession: KtFirAnalysisSession,
@@ -31,7 +31,10 @@ internal class KtFirMultiplatformInfoProvider(
}
if (status?.isActual != true) return emptyList()
val expectsForActual = firSymbol.expectForActual?.get(ExpectActualCompatibility.Compatible) ?: return emptyList()
return expectsForActual.map { analysisSession.firSymbolBuilder.buildSymbol(it) as KtDeclarationSymbol }
return firSymbol.expectForActual.orEmpty().asSequence()
.filter { it.key.isCompatibleOrWeaklyIncompatible }
.flatMap { it.value }
.map { analysisSession.firSymbolBuilder.buildSymbol(it) as KtDeclarationSymbol }
.toList()
}
}
}
@@ -52,6 +52,12 @@ public class FirIdeDependentAnalysisSourceModuleExpectForActualTestGenerated ext
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@Test
@TestMetadata("matchingButIncompatibleExpect.kt")
public void testMatchingButIncompatibleExpect() throws Exception {
runTest("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.kt");
}
@Test
@TestMetadata("multipleExpects.kt")
public void testMultipleExpects() throws Exception {
@@ -52,6 +52,12 @@ public class FirIdeNormalAnalysisSourceModuleExpectForActualTestGenerated extend
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@Test
@TestMetadata("matchingButIncompatibleExpect.kt")
public void testMatchingButIncompatibleExpect() throws Exception {
runTest("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.kt");
}
@Test
@TestMetadata("multipleExpects.kt")
public void testMultipleExpects() throws Exception {
@@ -52,6 +52,12 @@ public class FirStandaloneNormalAnalysisSourceModuleExpectForActualTestGenerated
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@Test
@TestMetadata("matchingButIncompatibleExpect.kt")
public void testMatchingButIncompatibleExpect() throws Exception {
runTest("analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.kt");
}
@Test
@TestMetadata("multipleExpects.kt")
public void testMultipleExpects() throws Exception {
@@ -0,0 +1,13 @@
// !LANGUAGE: +MultiPlatformProjects
// MODULE: commonMain
// FILE: Common.kt
package sample
expect fun foo()
// MODULE: androidMain(commonMain)
// FILE: JvmAndroid.kt
package sample
internal actual fun f<caret>oo() {}
@@ -0,0 +1,2 @@
expected symbols:
Common.kt : fun foo()