[FIR] Fix MT intellij tests
MT stands for "modularized tests" ^KT-64166 Fixed Review: https://jetbrains.team/p/kt/reviews/13517/timeline This commit fixes: java.lang.IllegalArgumentException: Local <local>/<anonymous> should never be used to find its corresponding classifier at org.jetbrains.kotlin.fir.resolve.providers.impl.FirProviderImpl.getFirClassifierByFqName(FirProviderImpl.kt:252) at org.jetbrains.kotlin.fir.resolve.providers.impl.FirProviderImpl$SymbolProvider.getClassLikeSymbolByClassId(FirProviderImpl.kt:60) at org.jetbrains.kotlin.fir.resolve.providers.impl.FirCachingCompositeSymbolProvider.computeClass(FirCachingCompositeSymbolProvider.kt:131) at org.jetbrains.kotlin.fir.resolve.providers.impl.FirCachingCompositeSymbolProvider.access$computeClass(FirCachingCompositeSymbolProvider.kt:27) at org.jetbrains.kotlin.fir.resolve.providers.impl.FirCachingCompositeSymbolProvider$special$$inlined$createCache$1.invoke(FirCachesFactory.kt:75) at org.jetbrains.kotlin.fir.resolve.providers.impl.FirCachingCompositeSymbolProvider$special$$inlined$createCache$1.invoke(FirCachesFactory.kt:69) at org.jetbrains.kotlin.fir.caches.FirThreadUnsafeCache.getValue(FirThreadUnsafeCachesFactory.kt:40) at org.jetbrains.kotlin.fir.resolve.providers.impl.FirCachingCompositeSymbolProvider.getClassLikeSymbolByClassId(FirCachingCompositeSymbolProvider.kt:158) at org.jetbrains.kotlin.fir.resolve.transformers.mpp.FirExpectActualResolver.findExpectForActual(FirExpectActualResolver.kt:41)
This commit is contained in:
+6
@@ -24484,6 +24484,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
|
|||||||
runTest("compiler/testData/diagnostics/tests/multiplatform/kt63860_2.kt");
|
runTest("compiler/testData/diagnostics/tests/multiplatform/kt63860_2.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt64166.kt")
|
||||||
|
public void testKt64166() throws Exception {
|
||||||
|
runTest("compiler/testData/diagnostics/tests/multiplatform/kt64166.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("manyImplMemberNotImplemented.kt")
|
@TestMetadata("manyImplMemberNotImplemented.kt")
|
||||||
public void testManyImplMemberNotImplemented() throws Exception {
|
public void testManyImplMemberNotImplemented() throws Exception {
|
||||||
|
|||||||
+6
@@ -24484,6 +24484,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
|
|||||||
runTest("compiler/testData/diagnostics/tests/multiplatform/kt63860_2.kt");
|
runTest("compiler/testData/diagnostics/tests/multiplatform/kt63860_2.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt64166.kt")
|
||||||
|
public void testKt64166() throws Exception {
|
||||||
|
runTest("compiler/testData/diagnostics/tests/multiplatform/kt64166.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("manyImplMemberNotImplemented.kt")
|
@TestMetadata("manyImplMemberNotImplemented.kt")
|
||||||
public void testManyImplMemberNotImplemented() throws Exception {
|
public void testManyImplMemberNotImplemented() throws Exception {
|
||||||
|
|||||||
+6
@@ -331,6 +331,12 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst
|
|||||||
runTest("compiler/testData/diagnostics/tests/multiplatform/kt63860_2.kt");
|
runTest("compiler/testData/diagnostics/tests/multiplatform/kt63860_2.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt64166.kt")
|
||||||
|
public void testKt64166() throws Exception {
|
||||||
|
runTest("compiler/testData/diagnostics/tests/multiplatform/kt64166.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("manyImplMemberNotImplemented.kt")
|
@TestMetadata("manyImplMemberNotImplemented.kt")
|
||||||
public void testManyImplMemberNotImplemented() throws Exception {
|
public void testManyImplMemberNotImplemented() throws Exception {
|
||||||
|
|||||||
+6
@@ -331,6 +331,12 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi
|
|||||||
runTest("compiler/testData/diagnostics/tests/multiplatform/kt63860_2.kt");
|
runTest("compiler/testData/diagnostics/tests/multiplatform/kt63860_2.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt64166.kt")
|
||||||
|
public void testKt64166() throws Exception {
|
||||||
|
runTest("compiler/testData/diagnostics/tests/multiplatform/kt64166.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("manyImplMemberNotImplemented.kt")
|
@TestMetadata("manyImplMemberNotImplemented.kt")
|
||||||
public void testManyImplMemberNotImplemented() throws Exception {
|
public void testManyImplMemberNotImplemented() throws Exception {
|
||||||
|
|||||||
+1
-1
@@ -37,6 +37,7 @@ object FirExpectActualResolver {
|
|||||||
var actualContainingClass: FirRegularClassSymbol? = null
|
var actualContainingClass: FirRegularClassSymbol? = null
|
||||||
var expectContainingClass: FirRegularClassSymbol? = null
|
var expectContainingClass: FirRegularClassSymbol? = null
|
||||||
val candidates = when {
|
val candidates = when {
|
||||||
|
callableId.isLocal -> return emptyMap()
|
||||||
classId != null -> {
|
classId != null -> {
|
||||||
actualContainingClass = useSiteSession.symbolProvider.getClassLikeSymbolByClassId(classId)
|
actualContainingClass = useSiteSession.symbolProvider.getClassLikeSymbolByClassId(classId)
|
||||||
?.fullyExpandedClass(useSiteSession)
|
?.fullyExpandedClass(useSiteSession)
|
||||||
@@ -49,7 +50,6 @@ object FirExpectActualResolver {
|
|||||||
else -> expectContainingClass?.getMembersForExpectClass(actualSymbol.name)
|
else -> expectContainingClass?.getMembersForExpectClass(actualSymbol.name)
|
||||||
}.orEmpty()
|
}.orEmpty()
|
||||||
}
|
}
|
||||||
callableId.isLocal -> return emptyMap()
|
|
||||||
else -> {
|
else -> {
|
||||||
val scope = FirPackageMemberScope(callableId.packageName, useSiteSession, useSiteSession.dependenciesSymbolProvider)
|
val scope = FirPackageMemberScope(callableId.packageName, useSiteSession, useSiteSession.dependenciesSymbolProvider)
|
||||||
mutableListOf<FirCallableSymbol<*>>().apply {
|
mutableListOf<FirCallableSymbol<*>>().apply {
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
// FIR_IDENTICAL
|
||||||
|
// MODULE: m1-common
|
||||||
|
// FILE: common.kt
|
||||||
|
|
||||||
|
interface I {
|
||||||
|
fun foo() {}
|
||||||
|
}
|
||||||
|
expect class Foo : I
|
||||||
|
|
||||||
|
// MODULE: m2-jvm()()(m1-common)
|
||||||
|
// FILE: jvm.kt
|
||||||
|
|
||||||
|
actual class Foo : I by object : I {
|
||||||
|
override fun foo() {}
|
||||||
|
}
|
||||||
Generated
+6
@@ -24484,6 +24484,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
|
|||||||
runTest("compiler/testData/diagnostics/tests/multiplatform/kt63860_2.kt");
|
runTest("compiler/testData/diagnostics/tests/multiplatform/kt63860_2.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("kt64166.kt")
|
||||||
|
public void testKt64166() throws Exception {
|
||||||
|
runTest("compiler/testData/diagnostics/tests/multiplatform/kt64166.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("manyImplMemberNotImplemented.kt")
|
@TestMetadata("manyImplMemberNotImplemented.kt")
|
||||||
public void testManyImplMemberNotImplemented() throws Exception {
|
public void testManyImplMemberNotImplemented() throws Exception {
|
||||||
|
|||||||
Reference in New Issue
Block a user