diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java new file mode 100644 index 00000000000..0e0e8df21ef --- /dev/null +++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java @@ -0,0 +1,18 @@ +package test; + +import org.jetbrains.annotations.NotNull; +import jet.runtime.typeinfo.KotlinSignature; +import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import java.util.*; + +public interface InheritProjectionKind { + + public interface Super { + @KotlinSignature("fun foo(p: MutableList)") + void foo(List p); + } + + public interface Sub extends Super { + void foo(List p); + } +} diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt new file mode 100644 index 00000000000..08a435cd565 --- /dev/null +++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt @@ -0,0 +1,12 @@ +package test + +public trait InheritProjectionKind: Object { + + public trait Super: Object { + public fun foo(p0: MutableList) + } + + public trait Sub: Super { + override fun foo(p0: MutableList) + } +} diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt new file mode 100644 index 00000000000..0bf4639ee78 --- /dev/null +++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt @@ -0,0 +1,10 @@ +namespace test + +public abstract trait test.InheritProjectionKind : java.lang.Object { + public abstract trait test.InheritProjectionKind.Sub : test.InheritProjectionKind.Super { + public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList): jet.Tuple0 + } + public abstract trait test.InheritProjectionKind.Super : java.lang.Object { + public abstract fun foo(/*0*/ p0: jet.MutableList): jet.Tuple0 + } +} diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index 25a813772d7..772d35a2081 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -461,6 +461,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNullability.java"); } + @TestMetadata("InheritProjectionKind.java") + public void testInheritProjectionKind() throws Exception { + doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java"); + } + @TestMetadata("InheritReadOnliness.java") public void testInheritReadOnliness() throws Exception { doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java"); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index 5e0a7cf16e0..a1f526b0344 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -1351,6 +1351,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNullability.kt"); } + @TestMetadata("InheritProjectionKind.kt") + public void testInheritProjectionKind() throws Exception { + doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt"); + } + @TestMetadata("InheritReadOnliness.kt") public void testInheritReadOnliness() throws Exception { doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt");