[FE, PSI2IR] Pass context receivers when calling typealias constructor

This commit is contained in:
Anastasiya Shadrina
2021-11-17 05:14:30 +07:00
committed by TeamCityServer
parent fb99df235e
commit bd4e51f304
8 changed files with 63 additions and 5 deletions
@@ -15976,6 +15976,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/extensionClasses/simple.kt");
}
@Test
@TestMetadata("typealiasForContextualClass.kt")
public void testTypealiasForContextualClass() throws Exception {
runTest("compiler/testData/codegen/box/extensionClasses/typealiasForContextualClass.kt");
}
@Test
@TestMetadata("useFromAnotherModule.kt")
public void testUseFromAnotherModule() throws Exception {
@@ -311,9 +311,9 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
.map(typeReference -> {
KotlinType kotlinType =
c.getTypeResolver().resolveType(getScopeForClassHeaderResolution(), typeReference, c.getTrace(), true);
return new ReceiverParameterDescriptorImpl(
return DescriptorFactory.createContextReceiverParameterForClass(
this,
new ContextClassReceiver(this, kotlinType, null),
kotlinType,
Annotations.Companion.getEMPTY()
);
}).collect(Collectors.toList());
@@ -252,7 +252,7 @@ fun StatementGenerator.generateCallReceiver(
}
dispatchReceiverValue = generateReceiverOrNull(ktDefaultElement, extensionReceiver ?: dispatchReceiver)
extensionReceiverValue = null
contextReceiverValues = emptyList()
contextReceiverValues = contextReceivers.mapNotNull { generateReceiverOrNull(ktDefaultElement, it) }
}
else -> {
dispatchReceiverValue = generateReceiverOrNull(ktDefaultElement, dispatchReceiver)
@@ -0,0 +1,17 @@
// !LANGUAGE: +ContextReceivers
// TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND_FIR: JVM_IR
class A {
val ok = "OK"
}
context(A)
class B {
val result = ok
}
typealias C = B
fun box(): String =
with(A()) { C().result }
@@ -15976,6 +15976,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/extensionClasses/simple.kt");
}
@Test
@TestMetadata("typealiasForContextualClass.kt")
public void testTypealiasForContextualClass() throws Exception {
runTest("compiler/testData/codegen/box/extensionClasses/typealiasForContextualClass.kt");
}
@Test
@TestMetadata("useFromAnotherModule.kt")
public void testUseFromAnotherModule() throws Exception {