[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:
+6
-7
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.descriptors.MemberDescriptor
|
|||||||
import org.jetbrains.kotlin.psi.KtDeclaration
|
import org.jetbrains.kotlin.psi.KtDeclaration
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
|
import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
|
||||||
import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver
|
import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver
|
||||||
import org.jetbrains.kotlin.resolve.multiplatform.K1ExpectActualCompatibility
|
import org.jetbrains.kotlin.resolve.multiplatform.isCompatibleOrWeaklyIncompatible
|
||||||
|
|
||||||
internal class KtFe10MultiplatformInfoProvider(
|
internal class KtFe10MultiplatformInfoProvider(
|
||||||
override val analysisSession: KtFe10AnalysisSession,
|
override val analysisSession: KtFe10AnalysisSession,
|
||||||
@@ -25,11 +25,10 @@ internal class KtFe10MultiplatformInfoProvider(
|
|||||||
if (actual.psiSafe<KtDeclaration>()?.hasActualModifier() != true) return emptyList()
|
if (actual.psiSafe<KtDeclaration>()?.hasActualModifier() != true) return emptyList()
|
||||||
val memberDescriptor = (getSymbolDescriptor(actual) as? MemberDescriptor)?.takeIf { it.isActual } ?: return emptyList()
|
val memberDescriptor = (getSymbolDescriptor(actual) as? MemberDescriptor)?.takeIf { it.isActual } ?: return emptyList()
|
||||||
|
|
||||||
val expectedCompatibilityMap =
|
return ExpectedActualResolver.findExpectedForActual(memberDescriptor).orEmpty().asSequence()
|
||||||
ExpectedActualResolver.findExpectedForActual(memberDescriptor) ?: return emptyList()
|
.filter { it.key.isCompatibleOrWeaklyIncompatible }
|
||||||
|
.flatMap { it.value }
|
||||||
val expectsForActual = (expectedCompatibilityMap[K1ExpectActualCompatibility.Compatible]
|
.map { it.toKtSymbol(analysisContext) as KtDeclarationSymbol }
|
||||||
?: expectedCompatibilityMap.values.flatten())
|
.toList()
|
||||||
return expectsForActual.map { it.toKtSymbol(analysisContext) as KtDeclarationSymbol }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+6
@@ -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);
|
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
|
@Test
|
||||||
@TestMetadata("multipleExpects.kt")
|
@TestMetadata("multipleExpects.kt")
|
||||||
public void testMultipleExpects() throws Exception {
|
public void testMultipleExpects() throws Exception {
|
||||||
|
|||||||
+7
-4
@@ -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.FirCallableSymbol
|
||||||
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
|
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
|
||||||
import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
|
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(
|
internal class KtFirMultiplatformInfoProvider(
|
||||||
override val analysisSession: KtFirAnalysisSession,
|
override val analysisSession: KtFirAnalysisSession,
|
||||||
@@ -31,7 +31,10 @@ internal class KtFirMultiplatformInfoProvider(
|
|||||||
}
|
}
|
||||||
if (status?.isActual != true) return emptyList()
|
if (status?.isActual != true) return emptyList()
|
||||||
|
|
||||||
val expectsForActual = firSymbol.expectForActual?.get(ExpectActualCompatibility.Compatible) ?: return emptyList()
|
return firSymbol.expectForActual.orEmpty().asSequence()
|
||||||
return expectsForActual.map { analysisSession.firSymbolBuilder.buildSymbol(it) as KtDeclarationSymbol }
|
.filter { it.key.isCompatibleOrWeaklyIncompatible }
|
||||||
|
.flatMap { it.value }
|
||||||
|
.map { analysisSession.firSymbolBuilder.buildSymbol(it) as KtDeclarationSymbol }
|
||||||
|
.toList()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -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);
|
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
|
@Test
|
||||||
@TestMetadata("multipleExpects.kt")
|
@TestMetadata("multipleExpects.kt")
|
||||||
public void testMultipleExpects() throws Exception {
|
public void testMultipleExpects() throws Exception {
|
||||||
|
|||||||
+6
@@ -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);
|
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
|
@Test
|
||||||
@TestMetadata("multipleExpects.kt")
|
@TestMetadata("multipleExpects.kt")
|
||||||
public void testMultipleExpects() throws Exception {
|
public void testMultipleExpects() throws Exception {
|
||||||
|
|||||||
+6
@@ -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);
|
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
|
@Test
|
||||||
@TestMetadata("multipleExpects.kt")
|
@TestMetadata("multipleExpects.kt")
|
||||||
public void testMultipleExpects() throws Exception {
|
public void testMultipleExpects() throws Exception {
|
||||||
|
|||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
expected symbols:
|
||||||
+13
@@ -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() {}
|
||||||
+2
@@ -0,0 +1,2 @@
|
|||||||
|
expected symbols:
|
||||||
|
Common.kt : fun foo()
|
||||||
Reference in New Issue
Block a user