diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java index f16546bcbf6..db8fdf306ff 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java @@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.jet.lang.resolve.java.JavaPackage; import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.java.resolver.ExternalAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.structure.JavaMember; @@ -119,6 +120,7 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD @NotNull List methodTypeParameters, @Nullable JetType returnType ) { + if (JavaPackage.getPLATFORM_TYPES()) return; TypeSubstitutor substitutor = DescriptorResolverUtils.createSubstitutorForTypeParameters(originalToAltTypeParameters); for (ValueParameterDescriptor parameter : valueParameters) { 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 617787389a7..f30b57bff61 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 @@ -26,6 +26,7 @@ import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.TypeResolver; +import org.jetbrains.jet.lang.resolve.java.JavaPackage; import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap; import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap; import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage; @@ -133,6 +134,8 @@ public class TypeTransformingVisitor extends JetVisitor { List arguments = originalType.getArguments(); if (arguments.size() != type.getTypeArgumentsAsTypes().size()) { + if (JavaPackage.getPLATFORM_TYPES()) return originalType; + throw new AlternativeSignatureMismatchException("'%s' type in method signature has %d type arguments, while '%s' in alternative signature has %d of them", DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(originalType), arguments.size(), type.getText(), type.getTypeArgumentsAsTypes().size()); @@ -185,7 +188,7 @@ public class TypeTransformingVisitor extends JetVisitor { if (type instanceof JetUserType) { JetTypeProjection typeProjection = ((JetUserType) type).getTypeArguments().get(i); altProjectionKind = TypeResolver.resolveProjectionKind(typeProjection.getProjectionKind()); - if (altProjectionKind != projectionKind && projectionKind != Variance.INVARIANT) { + if (altProjectionKind != projectionKind && projectionKind != Variance.INVARIANT && !JavaPackage.getPLATFORM_TYPES()) { throw new AlternativeSignatureMismatchException("Projection kind mismatch, actual: %s, in alternative signature: %s", projectionKind, altProjectionKind); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java index 3339039f3c4..a49501655d5 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java @@ -7,7 +7,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongProjectionKind { - @ExpectLoadError("Projection kind mismatch, actual: out, in alternative signature: ") + //@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/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java index d57417e63a1..058b3ef1ce8 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java @@ -5,7 +5,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongReturnTypeStructure { - @ExpectLoadError("'kotlin.String?' type in method signature has 0 type arguments, while 'String' in alternative signature has 1 of them") + //@ExpectLoadError("'kotlin.String?' type in method signature has 0 type arguments, while 'String' in alternative signature has 1 of them") @KotlinSignature("fun foo(a : String, b : List?>) : String?") public String foo(String a, List> b) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt index 1965419ecfe..d70aecc17e3 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt @@ -2,5 +2,5 @@ package test public open class WrongReturnTypeStructure { public constructor WrongReturnTypeStructure() - public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List!>!): kotlin.String! + public open fun foo(/*0*/ a: kotlin.String!, /*1*/ b: kotlin.(Mutable)List!>!): kotlin.String! } \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java index 1f299d5fcb1..f77d89c25bb 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java @@ -6,7 +6,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeParameterBoundStructure1 { - @ExpectLoadError("'java.lang.Runnable?' type in method signature has 0 type arguments, while 'Runnable' in alternative signature has 1 of them") + //@ExpectLoadError("'java.lang.Runnable?' type in method signature has 0 type arguments, while 'Runnable' in alternative signature has 1 of them") @KotlinSignature("fun > foo(a : A, b : List) where B : List") public > void foo(A a, List b) { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt index 0ab3a184095..6c94af8aeec 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt @@ -2,5 +2,5 @@ package test public open class WrongTypeParameterBoundStructure1 { public constructor WrongTypeParameterBoundStructure1() - public open fun foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList..kotlin.List?)): kotlin.Unit where B : kotlin.(Mutable)List! + public open fun foo(/*0*/ a: A!, /*1*/ b: (kotlin.MutableList..kotlin.List?)): kotlin.Unit where B : kotlin.(Mutable)List! } \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java index eaff297d920..cc6c48ef1ea 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java @@ -6,7 +6,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeParameterBoundStructure2 { - @ExpectLoadError("'kotlin.List?' type in method signature has 1 type arguments, while 'List' in alternative signature has 0 of them") + //@ExpectLoadError("'kotlin.List?' type in method signature has 1 type arguments, while 'List' in alternative signature has 0 of them") @KotlinSignature("fun foo(a : A, b : List) where B : List") public > void foo(A a, List b) { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt index 67e328e5fb3..4464f83263c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt @@ -2,5 +2,5 @@ package test public open class WrongTypeParameterBoundStructure2 { public constructor WrongTypeParameterBoundStructure2() - public open fun foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList..kotlin.List?)): kotlin.Unit where B : kotlin.(Mutable)List! + public open fun foo(/*0*/ a: A!, /*1*/ b: (kotlin.MutableList..kotlin.List?)): kotlin.Unit where B : kotlin.(Mutable)List! } \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java index f71d8e9395b..7153438ae37 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java @@ -5,7 +5,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongValueParameterStructure1 { - @ExpectLoadError("'kotlin.String?' type in method signature has 0 type arguments, while 'String' in alternative signature has 1 of them") + //@ExpectLoadError("'kotlin.String?' type in method signature has 0 type arguments, while 'String' in alternative signature has 1 of them") @KotlinSignature("fun foo(a : String, b : List?>) : String") public String foo(String a, List> b) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt index c3d3a66045a..9cde47b3c63 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt @@ -2,5 +2,5 @@ package test public open class WrongValueParameterStructure1 { public constructor WrongValueParameterStructure1() - public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List!>!): kotlin.String! + public open fun foo(/*0*/ a: kotlin.String!, /*1*/ b: kotlin.(Mutable)List!>!): kotlin.String! } \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java index 60a94b29f26..c193956f932 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java @@ -5,7 +5,7 @@ import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; public class WrongValueParameterStructure2 { - @ExpectLoadError("'kotlin.Map.Entry' type in method signature has 2 type arguments, while 'Map.Entry' in alternative signature has 1 of them") + //@ExpectLoadError("'kotlin.Map.Entry' type in method signature has 2 type arguments, while 'Map.Entry' in alternative signature has 1 of them") @KotlinSignature("fun foo(a : String, b : List?>) : String") public String foo(String a, List> b) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt index 47bd06fc51c..0f7c992194e 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt @@ -2,5 +2,5 @@ package test public open class WrongValueParameterStructure2 { public constructor WrongValueParameterStructure2() - public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List!>!): kotlin.String! + public open fun foo(/*0*/ a: kotlin.String!, /*1*/ b: kotlin.(Mutable)List!>!): kotlin.String! } \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java index 219cda957be..6303537f299 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java @@ -15,7 +15,7 @@ public interface ChangeProjectionKind1 { } public interface Sub extends Super { - @ExpectLoadError("Projection kind 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/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java index bf028158090..05af5864ce0 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java @@ -15,7 +15,7 @@ public interface ChangeProjectionKind2 { } public interface Sub extends Super { - @ExpectLoadError("Parameter type changed for method which overrides another: MutableList, was: MutableList") + //@ExpectLoadError("Parameter type changed for method which overrides another: MutableList, was: MutableList") @KotlinSignature("fun foo(p: MutableList)") void foo(List p); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java index 4a6a857e6d6..d3f2adcf82f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java @@ -15,7 +15,7 @@ public interface MutableToReadOnly { } public interface Sub extends Super { - @ExpectLoadError("Parameter type changed for method which overrides another: List, was: MutableList") + //@ExpectLoadError("Parameter type changed for method which overrides another: List, was: MutableList") @KotlinSignature("fun foo(p: List)") void foo(List p); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java index 6379df12ee0..4a568790abe 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java @@ -13,7 +13,7 @@ public interface NotNullToNullable { } public interface Sub extends Super { - @ExpectLoadError("Auto type 'kotlin.String' is not-null, while type in alternative signature is nullable: 'String?'") + //@ExpectLoadError("Auto type 'kotlin.String' is not-null, while type in alternative signature is nullable: 'String?'") @KotlinSignature("fun foo(p: String?)") void foo(String p); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java index 83f9b823803..2a01b654f78 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java @@ -13,7 +13,7 @@ public interface NullableToNotNull { } public interface Sub extends Super { - @ExpectLoadError("In superclass type is nullable: [String?], in subclass it is not: String") + //@ExpectLoadError("In superclass type is nullable: [String?], in subclass it is not: String") void foo(@NotNull String p); } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java index f535389c4ce..194833fd5ca 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java @@ -14,7 +14,7 @@ public interface NullableToNotNullKotlinSignature { } public interface Sub extends Super { - @ExpectLoadError("Parameter type changed for method which overrides another: String, was: String?") + //@ExpectLoadError("Parameter type changed for method which overrides another: String, was: String?") @KotlinSignature("fun foo(p: String)") void foo(String p); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java index cce7a99801b..0cda2e005da 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java @@ -15,7 +15,7 @@ public interface ReadOnlyToMutable { } public interface Sub extends Super { - @ExpectLoadError("Parameter type changed for method which overrides another: MutableList, was: List") + //@ExpectLoadError("Parameter type changed for method which overrides another: MutableList, was: List") @KotlinSignature("fun foo(p: MutableList)") void foo(List p); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java index 90e16237c12..ebbce09a2fb 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java @@ -14,7 +14,7 @@ public interface AddNullabilityJavaSubtype { } public interface Sub extends Super { - @ExpectLoadError("Auto type 'kotlin.String' is not-null, while type in alternative signature is nullable: 'String?'") + //@ExpectLoadError("Auto type 'kotlin.String' is not-null, while type in alternative signature is nullable: 'String?'") @KotlinSignature("fun foo(): String?") String foo(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java index 648a4740656..69d7e0742cb 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java @@ -15,7 +15,7 @@ public interface AddNullabilitySameGenericType1 { } public interface Sub extends Super { - @ExpectLoadError("Return type is changed to not subtype for method which overrides another: MutableList, was: MutableList") + //@ExpectLoadError("Return type is changed to not subtype for method which overrides another: MutableList, was: MutableList") @KotlinSignature("fun foo(): MutableList") List foo(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java index 6a141e9c428..22dfc680e3a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java @@ -15,7 +15,7 @@ public interface AddNullabilitySameGenericType2 { } public interface Sub extends Super { - @ExpectLoadError("Auto type 'kotlin.MutableList' is not-null, while type in alternative signature is nullable: 'MutableList?'") + //@ExpectLoadError("Auto type 'kotlin.MutableList' is not-null, while type in alternative signature is nullable: 'MutableList?'") @KotlinSignature("fun foo(): MutableList?") List foo(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java index 1c75f249a6c..36b1e0ebd75 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java @@ -15,7 +15,7 @@ public interface AddNullabilitySameJavaType { } public interface Sub extends Super { - @ExpectLoadError("Auto type 'kotlin.CharSequence' is not-null, while type in alternative signature is nullable: 'CharSequence?'") + //@ExpectLoadError("Auto type 'kotlin.CharSequence' is not-null, while type in alternative signature is nullable: 'CharSequence?'") @KotlinSignature("fun foo(): CharSequence?") CharSequence foo(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java index 6f245c36632..07e98d57691 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java @@ -16,7 +16,7 @@ public interface CantMakeImmutableInSubclass { } public interface Sub extends Super { - @ExpectLoadError("Return type is changed to not subtype for method which overrides another: List, was: MutableList") + //@ExpectLoadError("Return type is changed to not subtype for method which overrides another: List, was: MutableList") @KotlinSignature("fun foo(): List") List foo(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java index de58ea31710..b3d206ed671 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java @@ -23,7 +23,7 @@ public interface TwoSuperclassesConflictingProjectionKinds { } public interface Sub extends Super1, Super2 { - @ExpectLoadError("Incompatible projection kinds in type arguments of super methods' return types: [CharSequence, out CharSequence]") + //@ExpectLoadError("Incompatible projection kinds in type arguments of super methods' return types: [CharSequence, out CharSequence]") public Collection foo(); } } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java index 57cf655adde..b5cd1f12840 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java @@ -12,13 +12,10 @@ public interface ArraysInSubtypes { } interface Sub extends Super { - @ExpectLoadError("Return type is not a subtype of overridden method. To fix it, add annotation with Kotlin signature to super method with type Array? replaced with Array? in return type") String[] array(); - @ExpectLoadError("Return type is not a subtype of overridden method. To fix it, add annotation with Kotlin signature to super method with type Array? replaced with Array? in return type") List listOfArray(); - @ExpectLoadError("Return type is not a subtype of overridden method. To fix it, add annotation with Kotlin signature to super method with type Array? replaced with Array? in return type") T[] objArray(); } } \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java index 18448457a65..3b9a83959ca 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java @@ -16,7 +16,7 @@ public interface TwoSuperclassesInconsistentGenericTypes { } public class Sub implements TwoSuperclassesInconsistentGenericTypes, Other { - @ExpectLoadError("Incompatible types in superclasses: [String?, String]") + //@ExpectLoadError("Incompatible types in superclasses: [String?, String]") public List foo() { throw new UnsupportedOperationException(); } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java index b83471257f9..acafc3c0f87 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java @@ -19,9 +19,9 @@ public interface TwoSuperclassesVarargAndNot { } public interface Sub extends Super1, Super2 { - @ExpectLoadError("Incompatible projection kinds in type arguments of super methods' return types: [String?, out String?]|" + - "Incompatible super methods: some have vararg parameter, some have not|" + - "Incompatible types in superclasses: [Array, Array?]") + @ExpectLoadError(//"Incompatible projection kinds in type arguments of super methods' return types: [String?, out String?]|" + + //"Incompatible types in superclasses: [Array, Array?]|" + + "Incompatible super methods: some have vararg parameter, some have not|") void foo(String[] s); } } \ No newline at end of file