From e778ddfd21fa84f14548397f0abc6e6e541b8059 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Wed, 25 Oct 2023 23:12:19 +0200 Subject: [PATCH] [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 --- .../components/KtFe10MultiplatformInfoProvider.kt | 13 ++++++------- ...sisSourceModuleExpectForActualTestGenerated.java | 6 ++++++ .../components/KtFirMultiplatformInfoProvider.kt | 11 +++++++---- ...sisSourceModuleExpectForActualTestGenerated.java | 6 ++++++ ...sisSourceModuleExpectForActualTestGenerated.java | 6 ++++++ ...sisSourceModuleExpectForActualTestGenerated.java | 6 ++++++ .../matchingButIncompatibleExpect.descriptors.txt | 1 + .../matchingButIncompatibleExpect.kt | 13 +++++++++++++ .../matchingButIncompatibleExpect.txt | 2 ++ 9 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.descriptors.txt create mode 100644 analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.kt create mode 100644 analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.txt diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10MultiplatformInfoProvider.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10MultiplatformInfoProvider.kt index 6a5643852a8..ab553d62a7e 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10MultiplatformInfoProvider.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10MultiplatformInfoProvider.kt @@ -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()?.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() } } \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/multiplatformInfoProvider/Fe10IdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/multiplatformInfoProvider/Fe10IdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java index b5a486ae7ba..0f430e7b3c4 100644 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/multiplatformInfoProvider/Fe10IdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java +++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/multiplatformInfoProvider/Fe10IdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java @@ -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 { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMultiplatformInfoProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMultiplatformInfoProvider.kt index 67319870a90..46bbac8e3d0 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMultiplatformInfoProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMultiplatformInfoProvider.kt @@ -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() } -} \ No newline at end of file +} diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeDependentAnalysisSourceModuleExpectForActualTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeDependentAnalysisSourceModuleExpectForActualTestGenerated.java index 48ed3ab59b7..883bc208cab 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeDependentAnalysisSourceModuleExpectForActualTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeDependentAnalysisSourceModuleExpectForActualTestGenerated.java @@ -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 { diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java index a2db2fe93a2..ba57d96c161 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirIdeNormalAnalysisSourceModuleExpectForActualTestGenerated.java @@ -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 { diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirStandaloneNormalAnalysisSourceModuleExpectForActualTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirStandaloneNormalAnalysisSourceModuleExpectForActualTestGenerated.java index da2193e1ea8..4ca38ee84b2 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirStandaloneNormalAnalysisSourceModuleExpectForActualTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/multiplatformInfoProvider/FirStandaloneNormalAnalysisSourceModuleExpectForActualTestGenerated.java @@ -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 { diff --git a/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.descriptors.txt b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.descriptors.txt new file mode 100644 index 00000000000..e755e4f5b33 --- /dev/null +++ b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.descriptors.txt @@ -0,0 +1 @@ +expected symbols: diff --git a/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.kt b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.kt new file mode 100644 index 00000000000..ff9f97e426a --- /dev/null +++ b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.kt @@ -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 foo() {} diff --git a/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.txt b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.txt new file mode 100644 index 00000000000..bf80a6d4d3b --- /dev/null +++ b/analysis/analysis-api/testData/components/multiplatformInfoProvider/expectForActual/matchingButIncompatibleExpect.txt @@ -0,0 +1,2 @@ +expected symbols: +Common.kt : fun foo()