diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java index 6e66a727b6d..84d27fb1d12 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java @@ -157,7 +157,7 @@ class TypeTransformingVisitor extends JetVisitor { altProjectionKind = Variance.INVARIANT; } if (altProjectionKind != projectionKind && projectionKind != Variance.INVARIANT) { - throw new AlternativeSignatureMismatchException("Variance mismatch, actual: %s, in alternative signature: %s", + throw new AlternativeSignatureMismatchException("Projection kind mismatch, actual: %s, in alternative signature: %s", projectionKind, altProjectionKind); } } diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.java b/compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.java similarity index 75% rename from compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.java rename to compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.java index de5f58526f6..3339039f3c4 100644 --- a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.java +++ b/compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.java @@ -6,8 +6,8 @@ import java.util.*; import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; -public class WrongTypeVariance { - @ExpectLoadError("Variance mismatch, actual: out, in alternative signature: ") +public class WrongProjectionKind { + @ExpectLoadError("Projection kind mismatch, actual: out, in alternative signature: ") @KotlinSignature("fun copy(a : Array, b : Array) : MutableList") public List copy(Number[] from, Number[] to) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.kt similarity index 78% rename from compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.kt rename to compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.kt index adaf2fad6b2..8518497aa4a 100644 --- a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.kt +++ b/compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.kt @@ -2,7 +2,7 @@ package test import java.util.* -public open class WrongTypeVariance : Object() { +public open class WrongProjectionKind : Object() { public open fun copy(p0 : Array?, p1 : Array?) : MutableList? { throw UnsupportedOperationException() } diff --git a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.txt similarity index 59% rename from compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt rename to compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.txt index 234092a83d7..51f08067b58 100644 --- a/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt +++ b/compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.txt @@ -1,6 +1,6 @@ package test -public open class WrongTypeVariance : java.lang.Object { - public constructor WrongTypeVariance() +public open class WrongProjectionKind : java.lang.Object { + public constructor WrongProjectionKind() public open fun copy(/*0*/ p0 : jet.Array?, /*1*/ p1 : jet.Array?) : jet.MutableList? } diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java index f606b2cb887..465dad1dc8b 100644 --- a/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java +++ b/compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java @@ -13,7 +13,7 @@ public interface ChangeProjectionKind1 { } public interface Sub extends Super { - @ExpectLoadError("Variance mismatch, actual: in, in alternative signature: ") + @ExpectLoadError("Projection kind mismatch, actual: in, in alternative signature: ") @KotlinSignature("fun foo(p: MutableList)") void foo(List p); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index 06e932d9858..5a6df8345c9 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -408,6 +408,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { doTest("compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.java"); } + @TestMetadata("WrongProjectionKind.java") + public void testWrongProjectionKind() throws Exception { + doTest("compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.java"); + } + @TestMetadata("WrongReturnTypeStructure.java") public void testWrongReturnTypeStructure() throws Exception { doTest("compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.java"); @@ -443,11 +448,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.java"); } - @TestMetadata("WrongTypeVariance.java") - public void testWrongTypeVariance() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.java"); - } - @TestMetadata("WrongValueParameterStructure1.java") public void testWrongValueParameterStructure1() throws Exception { doTest("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.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 9ecee061917..e0319a122f7 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -1343,6 +1343,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.kt"); } + @TestMetadata("WrongProjectionKind.kt") + public void testWrongProjectionKind() throws Exception { + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.kt"); + } + @TestMetadata("WrongReturnTypeStructure.kt") public void testWrongReturnTypeStructure() throws Exception { doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.kt"); @@ -1378,11 +1383,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.kt"); } - @TestMetadata("WrongTypeVariance.kt") - public void testWrongTypeVariance() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.kt"); - } - @TestMetadata("WrongValueParameterStructure1.kt") public void testWrongValueParameterStructure1() throws Exception { doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.kt");