From d472154ea7595a59cf5889f1cddfa1334edd9be9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 13 Nov 2015 18:36:48 +0300 Subject: [PATCH] Remove KotlinSignature from tests, spec, delete tests with errors --- .../TypeTransformingVisitor.java | 16 +- .../cli/jvm/wrongKotlinSignature.args | 4 - .../testData/cli/jvm/wrongKotlinSignature.kt | 6 - .../testData/cli/jvm/wrongKotlinSignature.out | 7 - .../ClassWithWrongKotlinSignatures.java | 15 -- .../constructorNamedArguments.kt | 12 -- .../constructorNamedArguments.txt | 10 - .../kotlinSignature/parameterNames.kt | 18 -- .../kotlinSignature/parameterNames.txt | 26 --- .../kotlinSignature/AllBoundsInWhen.java | 3 - .../kotlinSignature/ArrayType.java | 3 - .../ConstructorWithNewTypeParams.java | 6 +- .../ConstructorWithParentTypeParams.java | 4 - .../ConstructorWithSeveralParams.java | 2 - .../ConstructorWithoutParams.java | 4 - .../kotlinSignature/CustomProjectionKind.java | 3 - .../MethodWithFunctionTypes.java | 5 - .../kotlinSignature/MethodWithGenerics.java | 3 - .../MethodWithMappedClasses.java | 3 - .../MethodWithTypeParameters.java | 6 - .../kotlinSignature/MethodWithVararg.java | 9 - .../kotlinSignature/PropertyArrayTypes.java | 8 - .../kotlinSignature/PropertyComplexTypes.java | 7 - .../kotlinSignature/PropertySimpleType.java | 5 - .../kotlinSignature/StarProjection.java | 3 - .../error/AddingNullability.java | 12 -- .../error/AddingNullability.txt | 6 - .../error/ConflictingProjectionKind.java | 15 -- .../error/ConflictingProjectionKind.txt | 6 - .../error/ExplicitFieldGettersAndSetters.java | 10 - .../error/ExplicitFieldGettersAndSetters.txt | 6 - .../error/ExtraUpperBound.java | 12 -- .../kotlinSignature/error/ExtraUpperBound.txt | 6 - .../error/MissingUpperBound.java | 12 -- .../error/MissingUpperBound.txt | 6 - .../kotlinSignature/error/NoFieldTypeRef.java | 10 - .../kotlinSignature/error/NoFieldTypeRef.txt | 6 - .../error/NotVarargReplacedWithVararg.java | 13 -- .../error/NotVarargReplacedWithVararg.txt | 6 - .../error/RedundantProjectionKind.java | 14 -- .../error/RedundantProjectionKind.txt | 6 - .../error/ReturnTypeMissing.java | 12 -- .../error/ReturnTypeMissing.txt | 6 - .../kotlinSignature/error/SyntaxError.java | 12 -- .../kotlinSignature/error/SyntaxError.txt | 6 - .../error/SyntaxErrorInFieldAnnotation.java | 10 - .../error/SyntaxErrorInFieldAnnotation.txt | 6 - .../error/VarargReplacedWithNotVararg.java | 13 -- .../error/VarargReplacedWithNotVararg.txt | 6 - .../error/WrongFieldInitializer.java | 10 - .../error/WrongFieldInitializer.txt | 6 - .../error/WrongFieldMutability.java | 14 -- .../error/WrongFieldMutability.txt | 7 - .../kotlinSignature/error/WrongFieldName.java | 10 - .../kotlinSignature/error/WrongFieldName.txt | 6 - .../error/WrongMethodName.java | 12 -- .../kotlinSignature/error/WrongMethodName.txt | 6 - .../error/WrongProjectionKind.java | 6 - .../error/WrongReturnTypeStructure.java | 4 - .../kotlinSignature/error/WrongTypeName1.java | 13 -- .../kotlinSignature/error/WrongTypeName1.txt | 6 - .../kotlinSignature/error/WrongTypeName2.java | 13 -- .../kotlinSignature/error/WrongTypeName2.txt | 6 - .../kotlinSignature/error/WrongTypeName3.java | 13 -- .../kotlinSignature/error/WrongTypeName3.txt | 6 - .../WrongTypeParameterBoundStructure1.java | 5 - .../WrongTypeParameterBoundStructure2.java | 13 -- .../WrongTypeParameterBoundStructure2.txt | 6 - .../error/WrongTypeParametersCount.java | 13 -- .../error/WrongTypeParametersCount.txt | 6 - .../error/WrongValueParameterStructure1.java | 4 - .../error/WrongValueParameterStructure2.java | 13 -- .../error/WrongValueParameterStructure2.txt | 6 - .../error/WrongValueParametersCount.java | 12 -- .../error/WrongValueParametersCount.txt | 6 - .../PropagateTypeArgumentNullable.java | 8 - .../parameter/ChangeProjectionKind1.java | 6 - .../parameter/ChangeProjectionKind2.java | 22 --- .../parameter/ChangeProjectionKind2.txt | 14 -- .../DeeplySubstitutedClassParameter.java | 4 - .../DeeplySubstitutedClassParameter2.java | 4 - .../parameter/InheritMutability.java | 20 -- .../parameter/InheritMutability.txt | 14 -- .../parameter/InheritNotVarargNotNull.java | 3 - .../parameter/InheritProjectionKind.java | 21 -- .../parameter/InheritProjectionKind.txt | 14 -- .../parameter/InheritReadOnliness.java | 20 -- .../parameter/InheritReadOnliness.txt | 14 -- .../parameter/InheritVarargNotNull.java | 3 - .../propagation/parameter/Kt3302.java | 2 - .../parameter/MutableToReadOnly.java | 6 - .../parameter/NotNullToNullable.java | 4 - .../parameter/NullableToNotNull.java | 3 - .../NullableToNotNullKotlinSignature.java | 5 - .../parameter/ReadOnlyToMutable.java | 5 - .../parameter/SubclassFromGenericAndNot.java | 2 - .../parameter/SubstitutedClassParameter.java | 4 - .../parameter/SubstitutedClassParameters.java | 5 - .../return/AddNullabilityJavaSubtype.java | 4 - .../AddNullabilitySameGenericType1.java | 6 - .../AddNullabilitySameGenericType2.java | 6 - .../return/AddNullabilitySameJavaType.java | 5 - .../return/CantMakeImmutableInSubclass.java | 7 - .../DeeplySubstitutedClassParameter.java | 6 - .../DeeplySubstitutedClassParameter2.java | 6 - .../return/HalfSubstitutedTypeParameters.java | 3 - ...heritNullabilityGenericSubclassSimple.java | 4 - .../return/InheritNullabilityJavaSubtype.java | 3 - .../InheritNullabilitySameGenericType.java | 4 - .../InheritNullabilitySameJavaType.java | 3 - .../return/InheritProjectionKind.java | 4 - .../return/InheritReadOnlinessOfArgument.java | 4 - .../return/InheritReadOnlinessSameClass.java | 5 - .../return/InheritReadOnlinessSubclass.java | 4 - .../return/SameProjectionKind.java | 4 - .../return/SubclassFromGenericAndNot.java | 4 - .../return/SubstitutedClassParameter.java | 6 - .../return/SubstitutedClassParameters.java | 7 - ...uperclassesConflictingProjectionKinds.java | 13 +- ...sInvariantAndCovariantInferMutability.java | 10 +- ...InvariantAndCovariantInferNullability.java | 10 +- .../return/TwoSuperclassesMutableAndNot.java | 10 +- .../TwoSuperclassesReturnJavaSubtype.java | 7 +- .../TwoSuperclassesReturnSameJavaType.java | 7 +- .../TwoSuperclassesSupplementNotNull.java | 11 +- .../propagation/return/TypeParamOfClass.java | 5 +- .../return/TypeParamOfClassSubstituted.java | 5 +- .../propagation/return/TypeParamOfFun.java | 5 +- .../typeParameter/InheritMutability.java | 19 -- .../typeParameter/InheritMutability.txt | 12 -- .../typeParameter/InheritNullability.java | 4 - .../typeParameter/InheritReadOnliness.java | 18 -- .../typeParameter/InheritReadOnliness.txt | 12 -- .../propagation/typeParameter/TwoBounds.java | 6 - .../typeParameter/TwoSuperclasses.java | 5 - .../typeParameter/TwoTypeParameters.java | 4 - .../UseParameterAsUpperBound.java | 5 - .../UseParameterInUpperBound.java | 3 - ...ameterInUpperBoundWithKotlinSignature.java | 4 - .../ArraysInSubtypes.java | 1 - ...oSuperclassesInconsistentGenericTypes.java | 6 - .../TwoSuperclassesVarargAndNot.java | 31 --- .../TwoSuperclassesVarargAndNot.txt | 19 -- .../loadJava/sourceJava/ReturnNotSubtype.java | 1 - .../DiagnosticsTestWithStdLibGenerated.java | 21 -- .../cli/KotlincExecutableTestGenerated.java | 6 - .../kotlin/cli/jvm/K2JvmCliTest.java | 7 - .../AbstractSdkAnnotationsValidityTest.java | 165 ---------------- .../AndroidSdkAnnotationsValidityTest.java | 67 ------- .../compiler/JdkAnnotationsValidityTest.java | 126 ------------ .../jvm/compiler/LoadJavaTestGenerated.java | 180 ------------------ ...mRuntimeDescriptorLoaderTestGenerated.java | 144 -------------- spec-docs/flexible-java-types.md | 32 +--- 153 files changed, 30 insertions(+), 1876 deletions(-) delete mode 100644 compiler/testData/cli/jvm/wrongKotlinSignature.args delete mode 100644 compiler/testData/cli/jvm/wrongKotlinSignature.kt delete mode 100644 compiler/testData/cli/jvm/wrongKotlinSignature.out delete mode 100644 compiler/testData/cli/jvm/wrongKotlinSignatureLib/library/ClassWithWrongKotlinSignatures.java delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.txt delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java delete mode 100644 compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt delete mode 100644 compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java delete mode 100644 compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt delete mode 100644 compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java delete mode 100644 compiler/tests/org/jetbrains/kotlin/jvm/compiler/AndroidSdkAnnotationsValidityTest.java delete mode 100644 compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java index b9bd5d7665a..82669b3ecd3 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.resolve.jvm.kotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; @@ -43,8 +42,6 @@ import static org.jetbrains.kotlin.load.java.components.TypeUsage.TYPE_ARGUMENT; import static org.jetbrains.kotlin.types.Variance.INVARIANT; public class TypeTransformingVisitor extends KtVisitor { - private static boolean strictMode = false; - private final KotlinType originalType; private final Map originalToAltTypeParameters; @@ -195,13 +192,7 @@ public class TypeTransformingVisitor extends KtVisitor { } if (altProjectionKind != INVARIANT && parameter.getVariance() != INVARIANT) { if (altProjectionKind == parameter.getVariance()) { - if (strictMode) { - throw new AlternativeSignatureMismatchException("Projection kind '%s' is redundant", - altProjectionKind, DescriptorUtils.getFqName(typeConstructor.getDeclarationDescriptor())); - } - else { - altProjectionKind = projectionKind; - } + altProjectionKind = projectionKind; } else { throw new AlternativeSignatureMismatchException("Projection kind '%s' is conflicting with variance of %s", @@ -241,9 +232,4 @@ public class TypeTransformingVisitor extends KtVisitor { private static boolean isSameName(String qualifiedName, String fullyQualifiedName) { return fullyQualifiedName.equals(qualifiedName) || fullyQualifiedName.endsWith("." + qualifiedName); } - - @TestOnly - public static void setStrictMode(boolean strictMode) { - TypeTransformingVisitor.strictMode = strictMode; - } } diff --git a/compiler/testData/cli/jvm/wrongKotlinSignature.args b/compiler/testData/cli/jvm/wrongKotlinSignature.args deleted file mode 100644 index 4661377fb56..00000000000 --- a/compiler/testData/cli/jvm/wrongKotlinSignature.args +++ /dev/null @@ -1,4 +0,0 @@ -$TESTDATA_DIR$/wrongKotlinSignature.kt -$TESTDATA_DIR$/wrongKotlinSignatureLib --d -$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/wrongKotlinSignature.kt b/compiler/testData/cli/jvm/wrongKotlinSignature.kt deleted file mode 100644 index 54f576741de..00000000000 --- a/compiler/testData/cli/jvm/wrongKotlinSignature.kt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -import library.ClassWithWrongKotlinSignatures - -val x = ClassWithWrongKotlinSignatures.foo() -val y = ClassWithWrongKotlinSignatures.bar() diff --git a/compiler/testData/cli/jvm/wrongKotlinSignature.out b/compiler/testData/cli/jvm/wrongKotlinSignature.out deleted file mode 100644 index a9aae583857..00000000000 --- a/compiler/testData/cli/jvm/wrongKotlinSignature.out +++ /dev/null @@ -1,7 +0,0 @@ -error: the following Java entities have annotations with wrong Kotlin signatures: -library.ClassWithWrongKotlinSignatures java.lang.String foo(): - Function names mismatch, original: foo, alternative: bar -library.ClassWithWrongKotlinSignatures java.lang.String bar(): - Function names mismatch, original: bar, alternative: foo - -COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/wrongKotlinSignatureLib/library/ClassWithWrongKotlinSignatures.java b/compiler/testData/cli/jvm/wrongKotlinSignatureLib/library/ClassWithWrongKotlinSignatures.java deleted file mode 100644 index 5e9db9cc25a..00000000000 --- a/compiler/testData/cli/jvm/wrongKotlinSignatureLib/library/ClassWithWrongKotlinSignatures.java +++ /dev/null @@ -1,15 +0,0 @@ -package library - -import jet.runtime.typeinfo.KotlinSignature; - -public class ClassWithWrongKotlinSignatures { - @KotlinSignature("fun bar() : String") - public static String foo() { - throw new UnsupportedOperationException(); - } - - @KotlinSignature("fun foo() : String") - public static String bar() { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt deleted file mode 100644 index 018c4c11b15..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt +++ /dev/null @@ -1,12 +0,0 @@ -// FILE: A.java - -import kotlin.jvm.KotlinSignature; - -public class A { - @KotlinSignature("fun A(x: Int, y: String)") - public A(int x, String y) {} -} - -// FILE: 1.kt - -val test = A(x = 1, y = "2") diff --git a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.txt b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.txt deleted file mode 100644 index a6fe6030465..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public val test: A - -public open class A { - public constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String!) - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt deleted file mode 100644 index 62648bc3150..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt +++ /dev/null @@ -1,18 +0,0 @@ -// FILE: A.java - -import kotlin.jvm.KotlinSignature; - -interface A { - @KotlinSignature("fun foo(kotlinSignatureName: String): Unit") - void foo(String javaName); -} - -// FILE: 1.kt - -class B : A { - override fun foo(kotlinName: String) {} -} - -class C : A { - override fun foo(kotlinSignatureName: String) {} -} diff --git a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.txt b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.txt deleted file mode 100644 index 28cc585adac..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.txt +++ /dev/null @@ -1,26 +0,0 @@ -package - -public/*package*/ /*synthesized*/ fun A(/*0*/ function: (kotlin.String!) -> kotlin.Unit): A - -public/*package*/ interface A { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ javaName: kotlin.String!): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class B : A { - public constructor B() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ fun foo(/*0*/ kotlinName: kotlin.String): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : A { - public constructor C() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ fun foo(/*0*/ kotlinSignatureName: kotlin.String): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.java index 88cfaf6dc94..587d7275080 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.java @@ -1,11 +1,8 @@ package test; -import jet.runtime.typeinfo.KotlinSignature; - import java.io.Serializable; public class AllBoundsInWhen { - @KotlinSignature("fun foo() where T: Serializable") public void foo() { throw new UnsupportedOperationException(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.java index 3a586e70375..47008969aaa 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.java @@ -1,9 +1,6 @@ package test; -import jet.runtime.typeinfo.KotlinSignature; - public class ArrayType { - @KotlinSignature("fun foo(): Array") public String[] foo() { throw new UnsupportedOperationException(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.java index e3037c7574a..ee644a4eaa7 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.java @@ -1,10 +1,6 @@ package test; -import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; - public class ConstructorWithNewTypeParams { - @KotlinSignature("fun ConstructorWithNewTypeParams(first : Any)") // TODO: first : U doesn't work - public ConstructorWithNewTypeParams(U first) { + public ConstructorWithNewTypeParams(U first) { } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.java index ca90fbd0529..85b28583a9c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.java @@ -1,10 +1,6 @@ package test; -import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; - public class ConstructorWithParentTypeParams { - @KotlinSignature("fun ConstructorWithParentTypeParams(first: T)") public ConstructorWithParentTypeParams(T first) { } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.java index bb3557a6daa..7920bc3272d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.java @@ -1,10 +1,8 @@ package test; import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; public class ConstructorWithSeveralParams { - @KotlinSignature("fun ConstructorWithSeveralParams(integer : Int, intField : Int, collection: ArrayList)") public ConstructorWithSeveralParams(Integer integer, int intBasic, ArrayList collection) { } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.java index bb7f11d07ff..cf7f1216548 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.java @@ -1,10 +1,6 @@ package test; -import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; - public class ConstructorWithoutParams { - @KotlinSignature("fun ConstructorWithoutParams()") public ConstructorWithoutParams() { } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.java index 6210ad842f5..a4c6eebae0c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.java @@ -2,10 +2,7 @@ package test; import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; - public class CustomProjectionKind { - @KotlinSignature("fun foo(): MutableList") public List foo() { throw new UnsupportedOperationException(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.java index ae4162d2726..698c1225ea5 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.java @@ -1,13 +1,8 @@ package test; -import java.lang.String; -import java.lang.UnsupportedOperationException; -import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; import kotlin.jvm.functions.*; public class MethodWithFunctionTypes { - @KotlinSignature("fun foo(f : (String?) -> String) : (() -> String?)?") public Function0 foo(Function1 f) { throw new UnsupportedOperationException(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.java index 0cc95bbf2a8..3686bd2542f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.java @@ -1,11 +1,8 @@ package test; -import java.lang.UnsupportedOperationException; import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; public class MethodWithGenerics { - @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/MethodWithMappedClasses.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.java index a549d970280..3c256ec7d8b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.java @@ -1,11 +1,8 @@ package test; -import java.lang.UnsupportedOperationException; import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; public class MethodWithMappedClasses { - @KotlinSignature("fun copy(dest : MutableList, src : List)") public void copy(List dest, List src) { throw new UnsupportedOperationException(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.java index 62d65ed7375..0ad4aea9b3c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.java @@ -1,14 +1,8 @@ package test; -import java.lang.UnsupportedOperationException; import java.util.*; -import java.util.BitSet; -import java.util.List; - -import jet.runtime.typeinfo.KotlinSignature; public class MethodWithTypeParameters { - @KotlinSignature("fun foo(a : A, b : List, c: MutableList) where B : List") public > void foo(A a, List b, List list) { } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.java index 1a1e5aceae7..85a2319bbb9 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.java @@ -1,15 +1,6 @@ package test; -import java.lang.String; -import java.lang.UnsupportedOperationException; -import java.util.*; -import java.util.BitSet; -import java.util.List; - -import jet.runtime.typeinfo.KotlinSignature; - public class MethodWithVararg { - @KotlinSignature("fun foo(vararg s : String)") public void foo(String... s) { } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.java index 2445fc60f4a..3242de8e15c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.java @@ -1,17 +1,9 @@ package test; -import java.lang.String; -import java.util.ArrayList; - -import jet.runtime.typeinfo.KotlinSignature; - public class PropertyArrayTypes { - @KotlinSignature("var arrayOfArrays : Array>") public String[][] arrayOfArrays; - @KotlinSignature("var array : Array") public String[] array; - @KotlinSignature("var genericArray : Array") public T[] genericArray; } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.java index 01f7a43362f..5d4dd66c874 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.java @@ -1,20 +1,13 @@ package test; -import java.lang.String; import java.util.ArrayList; -import jet.runtime.typeinfo.KotlinSignature; - public class PropertyComplexTypes { - @KotlinSignature("var genericType : T") public T genericType; - @KotlinSignature("var listDefinedGeneric : ArrayList") public ArrayList listDefinedGeneric; - @KotlinSignature("var listGeneric : ArrayList") public ArrayList listGeneric; - @KotlinSignature("var listOfGenericList : ArrayList>") public ArrayList> listOfGenericList; } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.java index 5bba1775f27..fa204ed5935 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.java @@ -1,12 +1,7 @@ package test; -import java.lang.String; -import jet.runtime.typeinfo.KotlinSignature; - public class PropertySimpleType { - @KotlinSignature("var fieldOne : String") public String fieldOne; - @KotlinSignature("var fieldTwo : String?") public String fieldTwo; } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.java index a88acd75715..93108b95336 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.java @@ -1,9 +1,6 @@ package test; -import jet.runtime.typeinfo.KotlinSignature; - public final class StarProjection { - @KotlinSignature("fun foo(): MyClass<*>") public final MyClass foo() { throw new UnsupportedOperationException(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java deleted file mode 100644 index 784dd036874..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java +++ /dev/null @@ -1,12 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class AddingNullability { - @ExpectLoadError("Auto type 'kotlin.Int' is not-null, while type in alternative signature is nullable: 'Int?'") - @KotlinSignature("fun foo() : Int?") - public int foo() { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.txt deleted file mode 100644 index d673339d6c7..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class AddingNullability { - public constructor AddingNullability() - public open fun foo(): kotlin.Int -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java deleted file mode 100644 index 3d1871e54a7..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java +++ /dev/null @@ -1,15 +0,0 @@ -package test; - -import java.lang.Number; -import java.util.*; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class ConflictingProjectionKind { - @ExpectLoadError("Projection kind 'in' is conflicting with variance of kotlin.List") - @KotlinSignature("fun foo(list: List)") - public void foo(List list) { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.txt deleted file mode 100644 index 04991e9d630..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class ConflictingProjectionKind { - public constructor ConflictingProjectionKind() - public open fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java deleted file mode 100644 index d8dbcf1bb01..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class ExplicitFieldGettersAndSetters { - @ExpectLoadError("Field annotation for shouldn't have getters and setters") - @KotlinSignature("var foo: String get() { return \"hello\" }") - public String foo; -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt deleted file mode 100644 index 307507b91ad..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class ExplicitFieldGettersAndSetters { - public constructor ExplicitFieldGettersAndSetters() - public final var foo: kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java deleted file mode 100644 index 2caa5179f71..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java +++ /dev/null @@ -1,12 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class ExtraUpperBound { - @ExpectLoadError("Upper bound number mismatch for A. Expected 1, but found 2") - @KotlinSignature("fun foo() : String where A : Cloneable") - public String foo() { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.txt deleted file mode 100644 index 1738562a3b1..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class ExtraUpperBound { - public constructor ExtraUpperBound() - public open fun foo(): kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java deleted file mode 100644 index 4b737b3a4bb..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java +++ /dev/null @@ -1,12 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class MissingUpperBound { - @ExpectLoadError("Upper bound number mismatch for A. Expected 2, but found 1") - @KotlinSignature("fun foo() : String") - public String foo() { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.txt deleted file mode 100644 index d457bbae3ae..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class MissingUpperBound { - public constructor MissingUpperBound() - public open fun foo(): kotlin.String! where A : kotlin.Cloneable! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java deleted file mode 100644 index 9a5e1dec546..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class NoFieldTypeRef { - @ExpectLoadError("Field annotation for shouldn't have type reference") - @KotlinSignature("var foo") - public String foo; -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.txt deleted file mode 100644 index e508522b29b..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class NoFieldTypeRef { - public constructor NoFieldTypeRef() - public final var foo: kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java deleted file mode 100644 index ead465f6435..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java +++ /dev/null @@ -1,13 +0,0 @@ -package test; - -import java.util.*; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class NotVarargReplacedWithVararg { - @ExpectLoadError("Parameter in method signature is not vararg, but in alternative signature it is vararg") - @KotlinSignature("fun foo(vararg s : String)") - public void foo(String s) { - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt deleted file mode 100644 index 484bf2caf43..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class NotVarargReplacedWithVararg { - public constructor NotVarargReplacedWithVararg() - public open fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java deleted file mode 100644 index 67fed777826..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java +++ /dev/null @@ -1,14 +0,0 @@ -package test; - -import java.lang.Number; -import java.util.*; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class RedundantProjectionKind { - @KotlinSignature("fun foo(list: List)") - public void foo(List list) { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt deleted file mode 100644 index 1249f47f755..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class RedundantProjectionKind { - public constructor RedundantProjectionKind() - public open fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java deleted file mode 100644 index 7063f7ebf38..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java +++ /dev/null @@ -1,12 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class ReturnTypeMissing { - @ExpectLoadError("Return type in alternative signature is missing, while in real signature it is 'kotlin.Int'") - @KotlinSignature("fun foo(a : String)") - public int foo(String a) { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.txt deleted file mode 100644 index 53e99875ff9..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class ReturnTypeMissing { - public constructor ReturnTypeMissing() - public open fun foo(/*0*/ p0: kotlin.String!): kotlin.Int -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java deleted file mode 100644 index ed6024935bf..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java +++ /dev/null @@ -1,12 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class SyntaxError { - @ExpectLoadError("Alternative signature has 2 syntax errors, first is at 8: Expecting a parameter declaration") - @KotlinSignature("fun foo(,) : Int") - public Integer foo() { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.txt deleted file mode 100644 index 19684a70ead..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class SyntaxError { - public constructor SyntaxError() - public open fun foo(): kotlin.Int! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java deleted file mode 100644 index 3847d2c8202..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class SyntaxErrorInFieldAnnotation { - @ExpectLoadError("Alternative signature has syntax error at 10: Type expected") - @KotlinSignature("var foo : ") - public String foo; -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt deleted file mode 100644 index 525bb51a098..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class SyntaxErrorInFieldAnnotation { - public constructor SyntaxErrorInFieldAnnotation() - public final var foo: kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java deleted file mode 100644 index aa8cd9f4330..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java +++ /dev/null @@ -1,13 +0,0 @@ -package test; - -import java.util.*; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class VarargReplacedWithNotVararg { - @ExpectLoadError("Parameter in method signature is vararg, but in alternative signature it is not") - @KotlinSignature("fun foo(s : String)") - public void foo(String... s) { - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt deleted file mode 100644 index eed5132ac74..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class VarargReplacedWithNotVararg { - public constructor VarargReplacedWithNotVararg() - public open fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java deleted file mode 100644 index 7d19cf8ccaf..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class WrongFieldInitializer { - @ExpectLoadError("Default value is not expected in annotation for field") - @KotlinSignature("var foo : String = \"Test\"") - public String foo; -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.txt deleted file mode 100644 index 0b651101037..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class WrongFieldInitializer { - public constructor WrongFieldInitializer() - public final var foo: kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java deleted file mode 100644 index 6cc731d511a..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java +++ /dev/null @@ -1,14 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class WrongFieldMutability { - @ExpectLoadError("Wrong mutability in annotation for field") - @KotlinSignature("val fooNotFinal : String") - public String fooNotFinal; - - @ExpectLoadError("Wrong mutability in annotation for field") - @KotlinSignature("var fooFinal : String") - public final String fooFinal = "Test"; -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.txt deleted file mode 100644 index e724a36fbf2..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.txt +++ /dev/null @@ -1,7 +0,0 @@ -package test - -public open class WrongFieldMutability { - public constructor WrongFieldMutability() - public final val fooFinal: kotlin.String! = "Test" - public final var fooNotFinal: kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java deleted file mode 100644 index aacabd3bb9e..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class WrongFieldName { - @ExpectLoadError("Field name mismatch, original: foo, alternative: bar") - @KotlinSignature("var bar: String") - public String foo; -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.txt deleted file mode 100644 index 7e090f0f95b..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class WrongFieldName { - public constructor WrongFieldName() - public final var foo: kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java deleted file mode 100644 index 9a7d5d82e8f..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java +++ /dev/null @@ -1,12 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class WrongMethodName { - @ExpectLoadError("Function names mismatch, original: foo, alternative: bar") - @KotlinSignature("fun bar() : String") - public String foo() { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.txt deleted file mode 100644 index 937fed5961c..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class WrongMethodName { - public constructor WrongMethodName() - public open fun foo(): kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java index f94bc4fbcc0..49b499e7a59 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java @@ -1,14 +1,8 @@ package test; -import java.lang.Number; import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - 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/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java index d918f1f5045..afc548ab440 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java @@ -1,12 +1,8 @@ package test; import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.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") - @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/WrongTypeName1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java deleted file mode 100644 index 1117f463f03..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java +++ /dev/null @@ -1,13 +0,0 @@ -package test; - -import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class WrongTypeName1 { - @ExpectLoadError("Alternative signature type mismatch, expected: Unit, actual: kotlin.String") - @KotlinSignature("fun foo(a : String) : Unit") - public String foo(String a) { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.txt deleted file mode 100644 index a6cda062bd5..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class WrongTypeName1 { - public constructor WrongTypeName1() - public open fun foo(/*0*/ p0: kotlin.String!): kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java deleted file mode 100644 index 2467cf1a766..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java +++ /dev/null @@ -1,13 +0,0 @@ -package test; - -import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class WrongTypeName2 { - @ExpectLoadError("Alternative signature type mismatch, expected: Something.String, actual: kotlin.String") - @KotlinSignature("fun foo(a : Something.String) : String") - public String foo(String a) { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.txt deleted file mode 100644 index ae585048749..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class WrongTypeName2 { - public constructor WrongTypeName2() - public open fun foo(/*0*/ p0: kotlin.String!): kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java deleted file mode 100644 index 3ff3c2bfa41..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java +++ /dev/null @@ -1,13 +0,0 @@ -package test; - -import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class WrongTypeName3 { - @ExpectLoadError("Alternative signature type mismatch, expected: List, actual: kotlin.String") - @KotlinSignature("fun foo(a : String) : List") - public String foo(String a) { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.txt deleted file mode 100644 index 0df001562cd..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class WrongTypeName3 { - public constructor WrongTypeName3() - public open fun foo(/*0*/ p0: kotlin.String!): kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java index 540f34c877c..f3d4228f59a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java @@ -2,12 +2,7 @@ package test; import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.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") - @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.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java deleted file mode 100644 index ba2344ef936..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java +++ /dev/null @@ -1,13 +0,0 @@ -package test; - -import java.util.*; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.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") - @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 deleted file mode 100644 index fbd5fb33303..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt +++ /dev/null @@ -1,6 +0,0 @@ -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! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java deleted file mode 100644 index 5351458c52c..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java +++ /dev/null @@ -1,13 +0,0 @@ -package test; - -import java.util.*; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class WrongTypeParametersCount { - @ExpectLoadError("Method signature has 2 type parameters, but alternative signature has 3") - @KotlinSignature("fun foo(a : A, b : List)") - public void foo(A a, List b) { - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.txt deleted file mode 100644 index c22e8929287..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class WrongTypeParametersCount { - public constructor WrongTypeParametersCount() - public open fun foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList..kotlin.List?)): kotlin.Unit -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java index 8ac98c1d10f..5b68eddbab0 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java @@ -1,12 +1,8 @@ package test; import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.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") - @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.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java deleted file mode 100644 index dc9e3c46cb8..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java +++ /dev/null @@ -1,13 +0,0 @@ -package test; - -import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.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") - @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 deleted file mode 100644 index 5fc7f7df07a..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class WrongValueParameterStructure2 { - public constructor WrongValueParameterStructure2() - public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List!>!): kotlin.String! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java deleted file mode 100644 index b86d7da93f4..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java +++ /dev/null @@ -1,12 +0,0 @@ -package test; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public class WrongValueParametersCount { - @ExpectLoadError("Method signature has 0 value parameters, but alternative signature has 1") - @KotlinSignature("fun foo(a : Int) : Int") - public Integer foo() { - throw new UnsupportedOperationException(); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.txt deleted file mode 100644 index b4cde051a9c..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -public open class WrongValueParametersCount { - public constructor WrongValueParametersCount() - public open fun foo(): kotlin.Int! -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.java index 81c6a502f77..44d6257f1d9 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.java @@ -1,28 +1,20 @@ package test; import java.util.List; -import jet.runtime.typeinfo.KotlinSignature; public interface PropagateTypeArgumentNullable { public interface Super { - - @KotlinSignature("fun outS(p : List)") void outS(List p); - @KotlinSignature("fun invOutS(p : MutableList>)") void invOutS(List> p); - @KotlinSignature("fun outOutS(p : List>)") void outOutS(List> p); - @KotlinSignature("fun outR() : List") List outR(); - @KotlinSignature("fun invR() : MutableList") List invR(); - @KotlinSignature("fun invOutR() : MutableList>") List> invOutR(); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java index 6fec8a0809b..bace4a476e1 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java @@ -1,22 +1,16 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; public interface ChangeProjectionKind1 { public interface Super { - @KotlinSignature("fun foo(p: MutableList)") void foo(List p); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super { - //@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 deleted file mode 100644 index 43e9ef3591e..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java +++ /dev/null @@ -1,22 +0,0 @@ -package test; - -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; -import java.util.*; - -public interface ChangeProjectionKind2 { - - public interface Super { - @KotlinSignature("fun foo(p: MutableList)") - void foo(List p); - - void dummy(); // to avoid loading as SAM interface - } - - public interface Sub extends Super { - //@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/ChangeProjectionKind2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt deleted file mode 100644 index a7145d7d22d..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt +++ /dev/null @@ -1,14 +0,0 @@ -package test - -public interface ChangeProjectionKind2 { - - public interface Sub : test.ChangeProjectionKind2.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit - } - - public interface Super { - public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java index 6c7a9309f3f..e08b2ad4680 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java @@ -1,12 +1,8 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - public interface DeeplySubstitutedClassParameter { public interface Super { - @KotlinSignature("fun foo(t: T)") void foo(T p); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java index 21ceae88a08..1f76c79a5c2 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java @@ -1,12 +1,8 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - public interface DeeplySubstitutedClassParameter2 { public interface Super { - @KotlinSignature("fun foo(t: T)") void foo(T p); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java deleted file mode 100644 index b6cba8076d5..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java +++ /dev/null @@ -1,20 +0,0 @@ -package test; - -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; -import java.util.*; - -public interface InheritMutability { - - public interface Super { - @KotlinSignature("fun foo(p: MutableList)") - void foo(List p); - - void dummy(); // to avoid loading as SAM interface - } - - public interface Sub extends Super { - void foo(List p); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt deleted file mode 100644 index 14469279462..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt +++ /dev/null @@ -1,14 +0,0 @@ -package test - -public interface InheritMutability { - - public interface Sub : test.InheritMutability.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit - } - - public interface Super { - public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java index 8b31c0b317d..ccc758246d0 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java @@ -1,11 +1,8 @@ package test; -import jet.runtime.typeinfo.KotlinSignature; - public interface InheritNotVarargNotNull { public interface Super { - @KotlinSignature("fun foo(p: Array)") void foo(String[] p); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java deleted file mode 100644 index 1ac57effdba..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java +++ /dev/null @@ -1,21 +0,0 @@ -//ALLOW_AST_ACCESS -package test; - -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; -import java.util.*; - -public interface InheritProjectionKind { - - public interface Super { - @KotlinSignature("fun foo(p: MutableList)") - void foo(List p); - - void dummy(); // to avoid loading as SAM interface - } - - public interface Sub extends Super { - void foo(List p); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt deleted file mode 100644 index 4cdbc33ccaf..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt +++ /dev/null @@ -1,14 +0,0 @@ -package test - -public interface InheritProjectionKind { - - public interface Sub : test.InheritProjectionKind.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit - } - - public interface Super { - public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java deleted file mode 100644 index f6069d468c6..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java +++ /dev/null @@ -1,20 +0,0 @@ -package test; - -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; -import java.util.*; - -public interface InheritReadOnliness { - - public interface Super { - @KotlinSignature("fun foo(p: List)") - void foo(List p); - - void dummy(); // to avoid loading as SAM interface - } - - public interface Sub extends Super { - void foo(List p); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt deleted file mode 100644 index 2820b39eb82..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt +++ /dev/null @@ -1,14 +0,0 @@ -package test - -public interface InheritReadOnliness { - - public interface Sub : test.InheritReadOnliness.Super { - public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit - } - - public interface Super { - public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.java index 61acb5fe1ac..7aa2edbae61 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.java @@ -1,11 +1,8 @@ package test; -import jet.runtime.typeinfo.KotlinSignature; - public interface InheritVarargNotNull { public interface Super { - @KotlinSignature("fun foo(vararg p: String)") void foo(String... p); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.java index e92fb08f714..205aa104dc9 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.java @@ -1,7 +1,6 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; // See SubclassFromGenericAndNot, as well public interface Kt3302 { @@ -12,7 +11,6 @@ public interface Kt3302 { } public interface LinkedHashMap { - @KotlinSignature("fun put(key : K, value : V) : V?") public V put(K key, V value); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java index b07b6a04d63..8cab7265d0a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java @@ -1,22 +1,16 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; public interface MutableToReadOnly { public interface Super { - @KotlinSignature("fun foo(p: MutableList)") void foo(List p); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super { - //@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 f5d0d4e744b..d5f4ad5b1eb 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java @@ -1,8 +1,6 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface NotNullToNullable { @@ -13,8 +11,6 @@ public interface NotNullToNullable { } public interface Sub extends Super { - //@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 f5b1560c4e6..2c4fb180c25 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java @@ -1,8 +1,6 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface NullableToNotNull { @@ -13,7 +11,6 @@ public interface NullableToNotNull { } public interface Sub extends Super { - //@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 65c62daaad8..6d79fe65f43 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java @@ -1,21 +1,16 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface NullableToNotNullKotlinSignature { public interface Super { - @KotlinSignature("fun foo(p: String?)") void foo(String p); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super { - //@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 c2cd9e3692b..55a5548c2d2 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java @@ -1,22 +1,17 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; public interface ReadOnlyToMutable { public interface Super { - @KotlinSignature("fun foo(p: List)") void foo(List p); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super { - //@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/parameter/SubclassFromGenericAndNot.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java index 7dade46bdbc..9146737a430 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java @@ -1,7 +1,6 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; // Extracted from KT-3302, see Kt3302 test, as well public interface SubclassFromGenericAndNot { @@ -13,7 +12,6 @@ public interface SubclassFromGenericAndNot { } public interface Generic { - @KotlinSignature("fun foo(key : T)") public void foo(T key); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java index 1c69f905d0b..80f3f575126 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java @@ -1,12 +1,8 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - public interface SubstitutedClassParameter { public interface Super { - @KotlinSignature("fun foo(t: T)") void foo(T p); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java index 467a59fc625..d80bb40b68d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java @@ -1,19 +1,14 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - public interface SubstitutedClassParameters { public interface Super1 { - @KotlinSignature("fun foo(t: T)") void foo(T p); void dummy(); // to avoid loading as SAM interface } public interface Super2 { - @KotlinSignature("fun foo(t: E)") void foo(E p); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java index e36c03c9df4..1f17c627d03 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java @@ -1,8 +1,6 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface AddNullabilityJavaSubtype { @@ -14,8 +12,6 @@ public interface AddNullabilityJavaSubtype { } public interface Sub extends Super { - //@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 95e11053de7..6f8218cbd7e 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java @@ -1,22 +1,16 @@ package test; -import org.jetbrains.annotations.NotNull; import java.util.List; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface AddNullabilitySameGenericType1 { public interface Super { - @KotlinSignature("fun foo(): MutableList") List foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super { - //@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 1440dc58d8d..491285b9927 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java @@ -1,22 +1,16 @@ package test; -import org.jetbrains.annotations.NotNull; import java.util.List; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface AddNullabilitySameGenericType2 { public interface Super { - @KotlinSignature("fun foo(): MutableList") List foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super { - //@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 edcde127f43..33e598c6a02 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java @@ -1,9 +1,6 @@ package test; import org.jetbrains.annotations.NotNull; -import java.lang.CharSequence; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface AddNullabilitySameJavaType { @@ -15,8 +12,6 @@ public interface AddNullabilitySameJavaType { } public interface Sub extends Super { - //@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 052e235c48a..0055a974c37 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java @@ -1,23 +1,16 @@ package test; -import org.jetbrains.annotations.NotNull; import java.util.*; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - public interface CantMakeImmutableInSubclass { public interface Super { - @KotlinSignature("fun foo(): MutableCollection") Collection foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super { - //@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/DeeplySubstitutedClassParameter.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java index 4c96c4d0493..05f8d455b36 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java @@ -1,14 +1,8 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - -import java.lang.String; - public interface DeeplySubstitutedClassParameter { public interface Super { - @KotlinSignature("fun foo(): T") T foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java index f5a27606b0c..3b0a161d705 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java @@ -1,14 +1,8 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - -import java.lang.String; - public interface DeeplySubstitutedClassParameter2 { public interface Super { - @KotlinSignature("fun foo(): T") T foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java index 7eb91491955..5bc48d85773 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java @@ -1,15 +1,12 @@ package test; import java.util.*; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; public interface HalfSubstitutedTypeParameters { public interface TrickyList extends List {} public interface Super { - @KotlinSignature("fun foo(): MutableList") List foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java index 9389cf1c8d8..a25a251f296 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java @@ -1,15 +1,11 @@ package test; -import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.Collection; -import jet.runtime.typeinfo.KotlinSignature; - public interface InheritNullabilityGenericSubclassSimple { public interface Super { - @KotlinSignature("fun foo(): MutableCollection") Collection foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java index c300dc7de9d..b8cfe423a14 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java @@ -1,9 +1,6 @@ package test; import org.jetbrains.annotations.NotNull; -import java.lang.CharSequence; - -import jet.runtime.typeinfo.KotlinSignature; public interface InheritNullabilityJavaSubtype { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java index 5eaee409556..e2ba65043b2 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java @@ -1,14 +1,10 @@ package test; -import org.jetbrains.annotations.NotNull; import java.util.List; -import jet.runtime.typeinfo.KotlinSignature; - public interface InheritNullabilitySameGenericType { public interface Super { - @KotlinSignature("fun foo(): MutableList") List foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java index cec7d32bc79..3df4673a1f5 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java @@ -1,9 +1,6 @@ package test; import org.jetbrains.annotations.NotNull; -import java.lang.CharSequence; - -import jet.runtime.typeinfo.KotlinSignature; public interface InheritNullabilitySameJavaType { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.java index ae1e005c6a4..0cff924bd8c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.java @@ -1,15 +1,11 @@ package test; -import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.Collection; -import jet.runtime.typeinfo.KotlinSignature; - public interface InheritProjectionKind { public interface Super { - @KotlinSignature("fun foo(): MutableCollection") Collection foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java index 23154fb45e2..f3439232aa9 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java @@ -1,15 +1,11 @@ package test; -import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.Collection; -import jet.runtime.typeinfo.KotlinSignature; - public interface InheritReadOnlinessOfArgument { public interface Super { - @KotlinSignature("fun foo(): List>>") List> foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java index 64e6f3129ad..9ab7f980c4d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java @@ -1,15 +1,10 @@ package test; -import org.jetbrains.annotations.NotNull; import java.util.List; -import java.util.Collection; - -import jet.runtime.typeinfo.KotlinSignature; public interface InheritReadOnlinessSameClass { public interface Super { - @KotlinSignature("fun foo(): List") List foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java index d1468ff4bd3..b7c229fa31a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java @@ -1,15 +1,11 @@ package test; -import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.Collection; -import jet.runtime.typeinfo.KotlinSignature; - public interface InheritReadOnlinessSubclass { public interface Super { - @KotlinSignature("fun foo(): Collection") Collection foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.java index 206d14d43e1..ab23d0c414b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.java @@ -1,11 +1,7 @@ package test; -import org.jetbrains.annotations.NotNull; -import java.util.List; import java.util.Collection; -import jet.runtime.typeinfo.KotlinSignature; - public interface SameProjectionKind { public interface Super { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java index dfafd9b5ee2..cbb286b9372 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java @@ -1,8 +1,5 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - public interface SubclassFromGenericAndNot { public interface NonGeneric { @@ -12,7 +9,6 @@ public interface SubclassFromGenericAndNot { } public interface Generic { - @KotlinSignature("fun foo(): T") public T foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.java index 3ba79d48d62..2926730b813 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.java @@ -1,14 +1,8 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - -import java.lang.String; - public interface SubstitutedClassParameter { public interface Super { - @KotlinSignature("fun foo(): T") T foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.java index 4ac1d725a13..c6766ae2198 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.java @@ -1,21 +1,14 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - -import java.lang.String; - public interface SubstitutedClassParameters { public interface Super1 { - @KotlinSignature("fun foo(): T") T foo(); void dummy(); // to avoid loading as SAM interface } public interface Super2 { - @KotlinSignature("fun foo(): E") E foo(); void dummy(); // to avoid loading as SAM interface diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java index 9c5094f91d4..8e991c0a075 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java @@ -1,29 +1,22 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - import java.util.*; public interface TwoSuperclassesConflictingProjectionKinds { public interface Super1 { - @KotlinSignature("fun foo(): MutableCollection") - public Collection foo(); + Collection foo(); void dummy(); // to avoid loading as SAM interface } public interface Super2 { - @KotlinSignature("fun foo(): MutableCollection") - public Collection foo(); + Collection foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super1, Super2 { - //@ExpectLoadError("Incompatible projection kinds in type arguments of super methods' return types: [CharSequence, out CharSequence]") - public Collection foo(); + Collection foo(); } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java index 68702d73d27..874bab11eac 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java @@ -1,26 +1,22 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; import java.util.*; public interface TwoSuperclassesInvariantAndCovariantInferMutability { public interface Super1 { - @KotlinSignature("fun foo(): List>") - public List> foo(); + List> foo(); void dummy(); // to avoid loading as SAM interface } public interface Super2 { - @KotlinSignature("fun foo(): MutableList>") - public List> foo(); + List> foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super1, Super2 { - public List> foo(); + List> foo(); } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java index 0a466ba23bc..4a980876da9 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java @@ -1,26 +1,22 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; import java.util.*; public interface TwoSuperclassesInvariantAndCovariantInferNullability { public interface Super1 { - @KotlinSignature("fun foo(): List") - public List foo(); + List foo(); void dummy(); // to avoid loading as SAM interface } public interface Super2 { - @KotlinSignature("fun foo(): MutableList") - public List foo(); + List foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super1, Super2 { - public List foo(); + List foo(); } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java index 6a3de917116..bc280cab2a0 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java @@ -1,26 +1,22 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; import java.util.*; public interface TwoSuperclassesMutableAndNot { public interface Super1 { - @KotlinSignature("fun foo(): MutableCollection") - public Collection foo(); + Collection foo(); void dummy(); // to avoid loading as SAM interface } public interface Super2 { - @KotlinSignature("fun foo(): List") - public List foo(); + List foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super1, Super2 { - public List foo(); + List foo(); } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java index 37cf50673a8..21ea8bdc343 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java @@ -1,24 +1,23 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; public interface TwoSuperclassesReturnJavaSubtype { public interface Super1 { - public CharSequence foo(); + CharSequence foo(); void dummy(); // to avoid loading as SAM interface } public interface Super2 { @NotNull - public CharSequence foo(); + CharSequence foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super1, Super2 { - public String foo(); + String foo(); } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java index 3050eca20b9..4b1b5dc2d73 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java @@ -1,24 +1,23 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; public interface TwoSuperclassesReturnSameJavaType { public interface Super1 { - public CharSequence foo(); + CharSequence foo(); void dummy(); // to avoid loading as SAM interface } public interface Super2 { @NotNull - public CharSequence foo(); + CharSequence foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super1, Super2 { - public CharSequence foo(); + CharSequence foo(); } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java index 8078d1da368..01e7a242b58 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java @@ -1,27 +1,22 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; import java.util.*; -import kotlin.*; public interface TwoSuperclassesSupplementNotNull { public interface Super1 { - @KotlinSignature("fun foo(): List") - public List foo(); + List foo(); void dummy(); // to avoid loading as SAM interface } public interface Super2 { - @KotlinSignature("fun foo(): List?") - public List foo(); + List foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super1, Super2 { - public List foo(); + List foo(); } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.java index ecc091177b6..a6e83c6657c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.java @@ -1,19 +1,18 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; import java.util.*; public interface TypeParamOfClass { public interface Super { @NotNull - public T foo(); + T foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super { - public T foo(); + T foo(); } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java index 18a86fd0218..9f6831f218c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java @@ -1,19 +1,18 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; import java.util.*; public interface TypeParamOfClassSubstituted { public interface Super { @NotNull - public T foo(); + T foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super { - public String foo(); + String foo(); } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.java index 6471bf5ebcf..445468e9569 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.java @@ -1,19 +1,18 @@ package test; import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; import java.util.*; public interface TypeParamOfFun { public interface Super { @NotNull - public T foo(); + T foo(); void dummy(); // to avoid loading as SAM interface } public interface Sub extends Super { - public E foo(); + E foo(); } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java deleted file mode 100644 index 6500612df90..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java +++ /dev/null @@ -1,19 +0,0 @@ -package test; - -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; -import java.util.*; -import java.util.List; - -public interface InheritMutability { - - public interface Super { - @KotlinSignature("fun > foo(a: A)") - > void foo(A a); - } - - public interface Sub extends Super { - > void foo(B b); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt deleted file mode 100644 index 8f15005ca18..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt +++ /dev/null @@ -1,12 +0,0 @@ -package test - -public interface InheritMutability { - - public interface Sub : test.InheritMutability.Super { - public abstract override /*1*/ fun !> foo(/*0*/ p0: B!): kotlin.Unit - } - - public interface Super { - public abstract fun !> foo(/*0*/ p0: A!): kotlin.Unit - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.java index 350d9dc3749..151db5b008f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.java @@ -1,12 +1,8 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - public interface InheritNullability { public interface Super { - @KotlinSignature("fun foo(a: A)") void foo(A a); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java deleted file mode 100644 index 48d310b6945..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java +++ /dev/null @@ -1,18 +0,0 @@ -package test; - -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; -import java.util.*; - -public interface InheritReadOnliness { - - public interface Super { - @KotlinSignature("fun > foo(a: A)") - > void foo(A a); - } - - public interface Sub extends Super { - > void foo(B b); - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt deleted file mode 100644 index 80c8838ee99..00000000000 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt +++ /dev/null @@ -1,12 +0,0 @@ -package test - -public interface InheritReadOnliness { - - public interface Sub : test.InheritReadOnliness.Super { - public abstract override /*1*/ fun !> foo(/*0*/ p0: B!): kotlin.Unit - } - - public interface Super { - public abstract fun !> foo(/*0*/ p0: A!): kotlin.Unit - } -} diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.java index 472f606708e..4fd7ee4b353 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.java @@ -1,14 +1,8 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - -import java.lang.Cloneable; - public interface TwoBounds { public interface Super { - @KotlinSignature("fun foo(a: A) where A: Cloneable") void foo(A a); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java index e23969d497f..fbf5e8305bf 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java @@ -1,17 +1,12 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - public interface TwoSuperclasses { public interface Super1 { - @KotlinSignature("fun foo(a: A)") void foo(A a); } public interface Super2 { - @KotlinSignature("fun foo(a: B)") void foo(B a); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java index 2b1b3275914..28d3882a736 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java @@ -1,12 +1,8 @@ package test; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - public interface TwoTypeParameters { public interface Super { - @KotlinSignature("fun foo(a: A, b: B)") void foo(A a, B b); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java index e1b2cd86a8a..0e200fe0531 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java @@ -1,13 +1,8 @@ package test; -import java.util.List; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; - public interface UseParameterAsUpperBound { public interface Super { - @KotlinSignature("fun foo(a: A, b: B)") void foo(A a, B b); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java index 4e85b95c357..275e1f64f95 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java @@ -1,13 +1,10 @@ package test; import java.util.List; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; public interface UseParameterInUpperBound { public interface Super { - @KotlinSignature("fun > foo(a: A, b: B)") > void foo(A a, B b); } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java index 9e924ea14aa..fab5f9f6022 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java @@ -1,18 +1,14 @@ package test; import java.util.List; -import org.jetbrains.annotations.NotNull; -import jet.runtime.typeinfo.KotlinSignature; public interface UseParameterInUpperBoundWithKotlinSignature { public interface Super { - @KotlinSignature("fun > foo(a: A, b: B)") > void foo(A a, B b); } public interface Sub extends Super { - @KotlinSignature("fun > foo(b: B, a: A)") > void foo(B b, A a); } } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java index 0b76a7e3a3b..f2c69b30d05 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java @@ -1,7 +1,6 @@ package test; import java.util.List; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface ArraysInSubtypes { interface Super { diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java index 677ac31dd35..cd16eae8740 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java @@ -3,24 +3,18 @@ package test; import org.jetbrains.annotations.NotNull; import java.util.List; -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - public interface TwoSuperclassesInconsistentGenericTypes { - @KotlinSignature("fun foo(): MutableList") List foo(); void dummy(); // To make it not SAM public interface Other { - @KotlinSignature("fun foo(): MutableList?") List foo(); void dummy(); // To make it not SAM } public class Sub implements TwoSuperclassesInconsistentGenericTypes, Other { - //@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 deleted file mode 100644 index 8a85874bfa4..00000000000 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java +++ /dev/null @@ -1,31 +0,0 @@ -package test; - -import org.jetbrains.annotations.NotNull; - -import java.lang.String; -import java.util.List; - -import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; - -public interface TwoSuperclassesVarargAndNot { - public interface Super1 { - void foo(String... s); - - void dummy(); // To make it not SAM - } - - public interface Super2 { - @KotlinSignature("fun foo(s : Array?)") - void foo(String[] s); - - void dummy(); // To make it not SAM - } - - public interface Sub extends Super1, Super2 { - @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); - } -} diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt deleted file mode 100644 index 995a8b93651..00000000000 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt +++ /dev/null @@ -1,19 +0,0 @@ -package test - -public interface TwoSuperclassesVarargAndNot { - - public interface Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 { - public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit - } - - public interface Super1 { - public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit - } - - public interface Super2 { - public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit - } -} diff --git a/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java b/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java index fd3f8ca441d..609f1a197d7 100644 --- a/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java +++ b/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java @@ -1,7 +1,6 @@ package test; import java.util.List; -import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface ReturnNotSubtype { interface Super { diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java index 96fffd0a38c..c47f1d35e21 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java @@ -746,27 +746,6 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } } - @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinSignature extends AbstractDiagnosticsTestWithStdLib { - public void testAllFilesPresentInKotlinSignature() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("constructorNamedArguments.kt") - public void testConstructorNamedArguments() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt"); - doTest(fileName); - } - - @TestMetadata("parameterNames.kt") - public void testParameterNames() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/kt7585") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java index 36ad8cd8473..cfff9476d52 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java @@ -253,12 +253,6 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes doJvmTest(fileName); } - @TestMetadata("wrongKotlinSignature.args") - public void testWrongKotlinSignature() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongKotlinSignature.args"); - doJvmTest(fileName); - } - @TestMetadata("wrongScriptWithNoSource.args") public void testWrongScriptWithNoSource() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongScriptWithNoSource.args"); diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java index f27a0b7ac59..cbadc7cb2fa 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java @@ -16,8 +16,6 @@ package org.jetbrains.kotlin.cli.jvm; -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.CliBaseTest; import org.junit.Assert; import org.junit.Test; @@ -25,11 +23,6 @@ import org.junit.Test; import java.io.File; public class K2JvmCliTest extends CliBaseTest { - @Test - public void wrongKotlinSignature() throws Exception { - executeCompilerCompareOutputJVM(); - } - @Test public void wrongAbiVersion() throws Exception { executeCompilerCompareOutputJVM(); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java deleted file mode 100644 index 1f7218a7496..00000000000 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.jvm.compiler; - -import com.google.common.collect.Maps; -import com.intellij.openapi.Disposable; -import com.intellij.openapi.util.Disposer; -import com.intellij.testFramework.UsefulTestCase; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; -import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; -import org.jetbrains.kotlin.incremental.components.NoLookupLocation; -import org.jetbrains.kotlin.load.java.JavaBindingContext; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; -import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; -import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.kotlin.resolve.BindingTrace; -import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; -import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.TypeTransformingVisitor; -import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; -import org.jetbrains.kotlin.resolve.scopes.MemberScope; - -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -public abstract class AbstractSdkAnnotationsValidityTest extends UsefulTestCase { - - private static final int CLASSES_IN_CHUNK = 100; - - protected abstract KotlinCoreEnvironment createEnvironment(Disposable parentDisposable); - - protected abstract List getClassesToValidate() throws IOException; - - @Override - protected void setUp() throws Exception { - super.setUp(); - TypeTransformingVisitor.setStrictMode(true); - } - - @Override - protected void tearDown() throws Exception { - TypeTransformingVisitor.setStrictMode(false); - super.tearDown(); - } - - public void testNoErrorsInAlternativeSignatures() throws IOException { - List affectedClasses = getClassesToValidate(); - - Map> errors = Maps.newLinkedHashMap(); - - for (int chunkIndex = 0; chunkIndex < affectedClasses.size() / CLASSES_IN_CHUNK + 1; chunkIndex++) { - Disposable parentDisposable = Disposer.newDisposable(); - - try { - KotlinCoreEnvironment commonEnvironment = createEnvironment(parentDisposable); - - BindingTrace trace = new CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(); - ModuleDescriptor module = LazyResolveTestUtil.resolve( - commonEnvironment.getProject(), trace, Collections.emptyList(), commonEnvironment - ); - - AlternativeSignatureErrorFindingVisitor visitor = - new AlternativeSignatureErrorFindingVisitor(trace.getBindingContext(), errors); - - int chunkStart = chunkIndex * CLASSES_IN_CHUNK; - for (FqName javaClass : affectedClasses.subList(chunkStart, Math.min(chunkStart + CLASSES_IN_CHUNK, affectedClasses.size()))) { - ClassDescriptor topLevelClass = DescriptorUtilsKt.resolveTopLevelClass(module, javaClass, NoLookupLocation.FROM_TEST); - PackageViewDescriptor topLevelPackage = module.getPackage(javaClass); - if (topLevelClass == null) { - continue; - } - - topLevelClass.acceptVoid(visitor); - - if (!topLevelPackage.isEmpty()) { - topLevelPackage.acceptVoid(visitor); - } - } - } - finally { - Disposer.dispose(parentDisposable); - } - } - - - if (!errors.isEmpty()) { - StringBuilder sb = new StringBuilder("Error(s) in SDK alternative signatures: \n"); - for (Map.Entry> entry : errors.entrySet()) { - sb.append(entry.getKey()).append(" : ").append(entry.getValue()).append("\n"); - } - fail(sb.toString()); - } - } - - private static class AlternativeSignatureErrorFindingVisitor extends DeclarationDescriptorVisitorEmptyBodies { - private final BindingContext bindingContext; - private final Map> errors; - - public AlternativeSignatureErrorFindingVisitor(BindingContext bindingContext, Map> errors) { - this.bindingContext = bindingContext; - this.errors = errors; - } - - @Override - public Void visitPackageViewDescriptor(PackageViewDescriptor descriptor, Void data) { - return visitDeclarationRecursively(descriptor, descriptor.getMemberScope()); - } - - @Override - public Void visitClassDescriptor(ClassDescriptor descriptor, Void data) { - // skip java.util.Collection, etc. - if (!JavaToKotlinClassMap.INSTANCE.mapPlatformClass(DescriptorUtils.getFqNameSafe(descriptor)).isEmpty()) { - return null; - } - - return visitDeclarationRecursively(descriptor, descriptor.getDefaultType().getMemberScope()); - } - - @Override - public Void visitFunctionDescriptor(FunctionDescriptor descriptor, Void data) { - return visitDeclaration(descriptor); - } - - @Override - public Void visitPropertyDescriptor(PropertyDescriptor descriptor, Void data) { - return visitDeclaration(descriptor); - } - - private Void visitDeclaration(@NotNull DeclarationDescriptor descriptor) { - List errors = bindingContext.get(JavaBindingContext.LOAD_FROM_JAVA_SIGNATURE_ERRORS, descriptor); - if (errors != null) { - this.errors.put(DescriptorRenderer.FQ_NAMES_IN_TYPES.render(descriptor), errors); - } - return null; - } - - private Void visitDeclarationRecursively(@NotNull DeclarationDescriptor descriptor, @NotNull MemberScope memberScope) { - for (DeclarationDescriptor member : DescriptorUtils.getAllDescriptors(memberScope)) { - member.acceptVoid(this); - } - return visitDeclaration(descriptor); - } - } -} diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AndroidSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AndroidSdkAnnotationsValidityTest.java deleted file mode 100644 index b224e347e17..00000000000 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AndroidSdkAnnotationsValidityTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.jvm.compiler; - -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.intellij.openapi.Disposable; -import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; -import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TestJdkKind; - -import java.io.IOException; -import java.util.Enumeration; -import java.util.List; -import java.util.Set; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; - -public class AndroidSdkAnnotationsValidityTest extends AbstractSdkAnnotationsValidityTest { - - @Override - protected KotlinCoreEnvironment createEnvironment(Disposable parentDisposable) { - CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( - ConfigurationKind.JDK_ONLY, TestJdkKind.ANDROID_API, KotlinTestUtils.getAnnotationsJar() - ); - return KotlinCoreEnvironment.createForTests(parentDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); - } - - @Override - protected List getClassesToValidate() throws IOException { - JarFile jar = new JarFile(KotlinTestUtils.findAndroidApiJar()); - try { - Enumeration entries = jar.entries(); - Set result = Sets.newLinkedHashSet(); - while (entries.hasMoreElements()){ - JarEntry entry = entries.nextElement(); - String entryName = entry.getName(); - if (!entry.isDirectory() && entryName.endsWith(".class")) { - String className = entryName.substring(0, entryName.length() - ".class".length()).replace("/", ".").replace("$", "."); - result.add(new FqName(className)); - } - } - return Lists.newArrayList(result); - } finally { - jar.close(); - } - } - -} diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java deleted file mode 100644 index e3b966b0602..00000000000 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.jvm.compiler; - -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.intellij.codeInsight.ExternalAnnotationsManager; -import com.intellij.openapi.Disposable; -import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.io.StreamUtil; -import com.intellij.openapi.vfs.VfsUtilCore; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.vfs.VirtualFileManager; -import com.intellij.openapi.vfs.VirtualFileVisitor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; -import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TestJdkKind; - -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class JdkAnnotationsValidityTest extends AbstractSdkAnnotationsValidityTest { - - // KT-4359 Alternative signature checking problem: Set is incompatible with Set - // - // - // - // - // - // - // - // - // - // - // - // - // - // - // KAnnotator produces above annotations and validation of TabularDataSupport results into: - // public open fun keySet(): kotlin.MutableSet defined in javax.management.openmbean.TabularDataSupport : - // [Incompatible types in superclasses: [Any?, Any, Any], Incompatible projection kinds in type arguments of super methods' return types: [out Any?, Any, Any]] - private static final Set classesToIgnore = new HashSet(Arrays.asList("javax.management.openmbean.TabularDataSupport")); - - private static KotlinCoreEnvironment createFullJdkEnvironment(Disposable parentDisposable) { - CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( - ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK, KotlinTestUtils.getAnnotationsJar() - ); - // TODO: move this test to idea-tests and re-implement it for ExternalAnnotationsManagerImpl - // configuration.add(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File("ideaSDK/lib/jdkAnnotations.jar")); - return KotlinCoreEnvironment.createForTests(parentDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); - } - - @Override - protected KotlinCoreEnvironment createEnvironment(Disposable parentDisposable) { - return createFullJdkEnvironment(parentDisposable); - } - - @Override - protected List getClassesToValidate() throws IOException { - return getAffectedClasses("jar://dist/kotlinc/lib/kotlin-jdk-annotations.jar!/"); - } - - static List getAffectedClasses(String rootUrl) { - Disposable myDisposable = Disposer.newDisposable(); - - try { - createFullJdkEnvironment(myDisposable); - - VirtualFile root = VirtualFileManager.getInstance().findFileByUrl(rootUrl); - assert root != null; - - final Set result = Sets.newLinkedHashSet(); - VfsUtilCore.visitChildrenRecursively(root, new VirtualFileVisitor() { - @Override - public boolean visitFile(@NotNull VirtualFile file) { - if (ExternalAnnotationsManager.ANNOTATIONS_XML.equals(file.getName())) { - try { - String text = StreamUtil.readText(file.getInputStream()); - Matcher matcher = Pattern.compile("") - List foo() { ... } -} - -``` - -Name resolution: `@KotlinSignature` can use short names from types, because full names are already specified in respective positions in -the Java signature. - -- If there's a `@KotlinSignature` annotation, other annotations are ignored -- If erasure of the signature specified by `@KotlinSignature` differs from the actual erased signature, - a warning is reported and the `@KotlinSignature` annotation is ignored -- Otherwise, the signature from `@KotlinSignature` is used. - #### @Nullable, @NotNull, @ReadOnly, @Mutable What can be annotated: @@ -436,7 +406,7 @@ fun foo(p: List!): R! // conflict on nullability, no conflict on mutability ``` ``` -fun foo(MutableList p): R // super A, written in Kotlin or has @KotlinSignature +fun foo(MutableList p): R // super A, written in Kotlin @Nullable R foo(List p) // subclass B