Fix SAM wrapper generation in secondary constructor calls

Should simply invoke 'checkSamCall' in corresponding visitor method to
check if call arguments should be wrapped.
This commit is contained in:
Dmitry Petrov
2017-12-01 15:32:25 +03:00
parent 3431a1445c
commit 0db6e5c3f3
3 changed files with 32 additions and 0 deletions
@@ -648,6 +648,8 @@ class CodegenAnnotatingVisitor extends KtVisitorVoid {
@Override
public void visitConstructorDelegationCall(@NotNull KtConstructorDelegationCall call) {
withinUninitializedClass(call, () -> super.visitConstructorDelegationCall(call));
checkSamCall(call);
}
private void withinUninitializedClass(@NotNull KtElement element, @NotNull Runnable operation) {
@@ -0,0 +1,24 @@
// FILE: test.kt
class Test : Base {
constructor(f: () -> String) : super(f)
}
fun box() = Test({ "OK" }).get()
// FILE: Supplier.java
public interface Supplier<T> {
T get();
}
// FILE: Base.java
public class Base {
private final Supplier<String> supplier;
public Base(Supplier<String> supplier) {
this.supplier = supplier;
}
public String get() {
return supplier.get();
}
}
@@ -787,6 +787,12 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxAga
doTest(fileName);
}
@TestMetadata("superInSecondaryConstructor.kt")
public void testSuperInSecondaryConstructor() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/superInSecondaryConstructor.kt");
doTest(fileName);
}
@TestMetadata("superconstructor.kt")
public void testSuperconstructor() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt");