From 6ca7d2aad7018b93c04f06e6234ecba9207370fd Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 20 Apr 2015 18:44:41 +0300 Subject: [PATCH] Regenerate test data Add properties for Java annotations --- .../tests/namedArguments/allowForJavaAnnotation.txt | 2 ++ .../annotationParameters/javaClassArgumentError.txt | 1 + .../annotationParameters/javaClassArrayInAnnotations.txt | 2 ++ .../annotationParameters/javaClassInAnnotations.txt | 4 +++- .../annotations/annotationParameters/orderWithValue.txt | 6 ++++++ .../annotationParameters/orderWithoutValue.txt | 5 +++++ .../annotations/annotationParameters/valueArray.txt | 3 +++ .../annotationParameters/valueArrayAndOtherDefault.txt | 3 +++ .../valueArrayAndOtherDefaultError.txt | 2 ++ .../annotations/annotationParameters/valueArrayOnly.txt | 1 + .../annotationParameters/valueArrayWithDefault.txt | 1 + .../javaAnnotationWithVarargArgument.txt | 1 + .../annotationAsArgument.txt | 5 +++++ .../annotationsWithJavaLangClassParameterOverload/arg.txt | 1 + .../argAndOtherDefault.txt | 2 ++ .../argArray.txt | 1 + .../argWithDefault.txt | 1 + .../argWithDefaultAndOther.txt | 2 ++ .../twoArgs.txt | 2 ++ .../value.txt | 1 + .../valueAndOtherDefault.txt | 2 ++ .../valueArray.txt | 1 + .../valueWithDefault.txt | 1 + .../valueWithDefaultAndOther.txt | 2 ++ .../annotationAsArgument.txt | 5 +++++ .../javaAnnotationsWithKClassParameter/arg.txt | 1 + .../argAndOtherDefault.txt | 2 ++ .../javaAnnotationsWithKClassParameter/argArray.txt | 1 + .../javaAnnotationsWithKClassParameter/argWithDefault.txt | 1 + .../argWithDefaultAndOther.txt | 2 ++ .../javaAnnotationsWithKClassParameter/twoArgs.txt | 2 ++ .../javaAnnotationsWithKClassParameter/value.txt | 1 + .../valueAndOtherDefault.txt | 2 ++ .../javaAnnotationsWithKClassParameter/valueArray.txt | 1 + .../valueWithDefault.txt | 1 + .../valueWithDefaultAndOther.txt | 2 ++ .../prohibitPositionedArgument/tooManyArgs.txt | 3 +++ .../prohibitPositionedArgument/typeMismatch.txt | 3 +++ .../annotations/prohibitPositionedArgument/withValue.txt | 4 ++++ .../prohibitPositionedArgument/withoutValue.txt | 3 +++ .../compiledJava/annotations/AnnotatedConstructor.txt | 1 + .../loadJava/compiledJava/annotations/AnnotatedField.txt | 1 + .../loadJava/compiledJava/annotations/AnnotatedMethod.txt | 1 + .../compiledJava/annotations/AnnotatedValueParameter.txt | 1 + .../compiledJava/annotations/AnnotationInParam.txt | 7 +++++++ .../annotations/ArithmeticExpressionInParam.txt | 1 + .../compiledJava/annotations/ArrayOfEnumInParam.txt | 1 + .../compiledJava/annotations/ArrayOfStringInParam.txt | 1 + .../compiledJava/annotations/ClassObjectArrayInParam.txt | 1 + .../compiledJava/annotations/ClassObjectInParam.txt | 1 + .../compiledJava/annotations/ClassObjectInParamRaw.txt | 2 ++ .../annotations/ClassObjectInParamVariance.txt | 8 ++++++++ .../compiledJava/annotations/CustomAnnotation.txt | 1 + .../annotations/CustomAnnotationWithDefaultParameter.txt | 2 ++ .../compiledJava/annotations/EmptyArrayInParam.txt | 1 + .../annotations/EnumArgumentWithCustomToString.txt | 2 ++ .../compiledJava/annotations/EnumConstructorParameter.txt | 1 + .../loadJava/compiledJava/annotations/EnumInParam.txt | 2 ++ .../compiledJava/annotations/NestedEnumArgument.txt | 1 + .../compiledJava/annotations/PrimitiveValueInParam.txt | 6 ++++++ .../compiledJava/annotations/RecursiveAnnotation.txt | 2 ++ .../compiledJava/annotations/RecursiveAnnotation2.txt | 2 ++ .../annotations/StringConcatenationInParam.txt | 1 + .../compiledJava/annotations/StringConstantInParam.txt | 1 + .../loadJava/compiledJava/annotations/StringInParam.txt | 1 + .../testData/loadJava/sourceJava/NullInAnnotation.txt | 2 ++ 66 files changed, 136 insertions(+), 1 deletion(-) diff --git a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt b/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt index 855760901d7..dbc762bfca9 100644 --- a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt +++ b/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt @@ -4,6 +4,8 @@ A(x = IntegerValueType(1): IntegerValueType(1), y = "2": kotlin.String) internal public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String) + public final val x: kotlin.Int + public final val 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/annotations/annotationParameters/javaClassArgumentError.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArgumentError.txt index 3fb2f0ce6ac..1a29d7db142 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArgumentError.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArgumentError.txt @@ -5,6 +5,7 @@ internal val jClass: java.lang.Class public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ vararg value: java.lang.Class<*> /*kotlin.Array>*/) public constructor A(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array>*/) + public final val value: kotlin.Array> 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/annotations/annotationParameters/javaClassArrayInAnnotations.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArrayInAnnotations.txt index 5f97cf407f0..0eaeb574ec1 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArrayInAnnotations.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArrayInAnnotations.txt @@ -3,6 +3,8 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ vararg value: java.lang.Class<*> /*kotlin.Array>*/ = ..., /*1*/ arg: kotlin.Array> = ...) public constructor A(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array>*/ = ..., /*1*/ arg: kotlin.Array> = ...) + public final val arg: kotlin.Array> + public final val value: kotlin.Array> public abstract fun arg(): kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassInAnnotations.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassInAnnotations.txt index 5318be6a8f6..eed348940bd 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassInAnnotations.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassInAnnotations.txt @@ -1,8 +1,10 @@ -package +package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*> = ..., /*1*/ arg: java.lang.Class<*> = ...) public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ..., /*1*/ arg: kotlin.reflect.KClass<*> = ...) + public final val arg: kotlin.reflect.KClass<*> + public final val value: kotlin.reflect.KClass<*> public abstract fun arg(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt index 4a4e8af7019..ce79ad666ce 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt @@ -3,6 +3,12 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ value: kotlin.String, /*1*/ b: kotlin.Double, /*2*/ x1: java.lang.Class<*>, /*3*/ a: kotlin.Int, /*4*/ x: java.lang.Class<*>, /*5*/ x2: java.lang.Class<*>) public constructor A(/*0*/ value: kotlin.String, /*1*/ b: kotlin.Double, /*2*/ x1: kotlin.reflect.KClass<*>, /*3*/ a: kotlin.Int, /*4*/ x: kotlin.reflect.KClass<*>, /*5*/ x2: kotlin.reflect.KClass<*>) + public final val a: kotlin.Int + public final val b: kotlin.Double + public final val value: kotlin.String + public final val x: kotlin.reflect.KClass<*> + public final val x1: kotlin.reflect.KClass<*> + public final val x2: kotlin.reflect.KClass<*> public abstract fun a(): kotlin.Int public abstract fun b(): kotlin.Double public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt index 0a4caa9c727..ad682e93e5e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt @@ -3,6 +3,11 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ b: kotlin.Double, /*1*/ x1: java.lang.Class<*>, /*2*/ a: kotlin.Int, /*3*/ x: java.lang.Class<*>, /*4*/ x2: java.lang.Class<*>) public constructor A(/*0*/ b: kotlin.Double, /*1*/ x1: kotlin.reflect.KClass<*>, /*2*/ a: kotlin.Int, /*3*/ x: kotlin.reflect.KClass<*>, /*4*/ x2: kotlin.reflect.KClass<*>) + public final val a: kotlin.Int + public final val b: kotlin.Double + public final val x: kotlin.reflect.KClass<*> + public final val x1: kotlin.reflect.KClass<*> + public final val x2: kotlin.reflect.KClass<*> public abstract fun a(): kotlin.Int public abstract fun b(): kotlin.Double public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt index ad3b2fa34e5..d348cdc8c6e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt @@ -12,6 +12,9 @@ A(value = {"8", "9", "10"}: kotlin.Array) internal fun test8( public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array*/, /*1*/ x: java.lang.Class<*> = ..., /*2*/ y: kotlin.Int) public constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array*/, /*1*/ x: kotlin.reflect.KClass<*> = ..., /*2*/ y: kotlin.Int) + public final val value: kotlin.Array + public final val x: kotlin.reflect.KClass<*> + public final val y: kotlin.Int 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/annotations/annotationParameters/valueArrayAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt index 19c60c856d5..b456fd40399 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt @@ -15,6 +15,9 @@ A(value = {}: kotlin.Array, x = kotlin.Any::class: kotlin.ref public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array*/, /*1*/ x: java.lang.Class<*> = ..., /*2*/ y: kotlin.Int = ...) public constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array*/, /*1*/ x: kotlin.reflect.KClass<*> = ..., /*2*/ y: kotlin.Int = ...) + public final val value: kotlin.Array + public final val x: kotlin.reflect.KClass<*> + public final val y: kotlin.Int 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/annotations/annotationParameters/valueArrayAndOtherDefaultError.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.txt index 85722927b12..84056350e8b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.txt @@ -5,6 +5,8 @@ A(x = javaClass(): java.lang.Class, y = "": kotlin.Strin public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ x: java.lang.Class<*> = ..., /*1*/ y: kotlin.Int) public constructor A(/*0*/ x: kotlin.reflect.KClass<*> = ..., /*1*/ y: kotlin.Int) + public final val x: kotlin.reflect.KClass<*> + public final val y: kotlin.Int 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/annotations/annotationParameters/valueArrayOnly.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt index 72cd3d644a1..941327b32c1 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt @@ -8,6 +8,7 @@ A(value = {}: kotlin.Array) internal fun test5(): kotlin.Unit public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array*/) + public final val value: kotlin.Array 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/annotations/annotationParameters/valueArrayWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt index f3e4a3aba6b..fa78097c9e5 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt @@ -8,6 +8,7 @@ A() internal fun test5(): kotlin.Unit public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array*/ = ...) + public final val value: kotlin.Array 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/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt index 96c2194c0d8..d3b8c9c1f40 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt @@ -4,6 +4,7 @@ A(value = {IntegerValueType(1), "b"}: kotlin.Array) internal fun test(): ko public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array*/) + public final val value: kotlin.Array 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/annotations/annotationsWithJavaLangClassParameterOverload/annotationAsArgument.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/annotationAsArgument.txt index 03d03cea3ec..0ff9680a4c9 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/annotationAsArgument.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/annotationAsArgument.txt @@ -3,6 +3,9 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*> = ..., /*1*/ x: kotlin.Int = ..., /*2*/ b: B) public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int = ..., /*2*/ b: B) + public final val arg: kotlin.reflect.KClass<*> + public final val b: B + public final val x: kotlin.Int public abstract fun arg(): kotlin.reflect.KClass<*> public abstract fun b(): B public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -14,6 +17,8 @@ public final annotation class A : kotlin.Annotation { public final annotation class B : kotlin.Annotation { public /*synthesized*/ constructor B(/*0*/ arg: java.lang.Class<*> = ..., /*1*/ y: kotlin.Int = ...) public constructor B(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ y: kotlin.Int = ...) + public final val arg: kotlin.reflect.KClass<*> + public final val y: kotlin.Int public abstract fun arg(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/arg.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/arg.txt index 89e5886fc42..3a81bf72786 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/arg.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/arg.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*>) public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>) + public final val arg: kotlin.reflect.KClass<*> public abstract fun arg(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argAndOtherDefault.txt index ee6f9f6a4e1..9bab3ef7fb5 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argAndOtherDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argAndOtherDefault.txt @@ -3,6 +3,8 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*>, /*1*/ x: kotlin.Int = ...) public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>, /*1*/ x: kotlin.Int = ...) + public final val arg: kotlin.reflect.KClass<*> + public final val x: kotlin.Int public abstract fun arg(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argArray.txt index b59dc6de114..c4604112a42 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argArray.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argArray.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: kotlin.Array>) public constructor A(/*0*/ arg: kotlin.Array>) + public final val arg: kotlin.Array> public abstract fun arg(): kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefault.txt index 9129da9a33a..dcc9c1021d3 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefault.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*> = ...) public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ...) + public final val arg: kotlin.reflect.KClass<*> public abstract fun arg(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefaultAndOther.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefaultAndOther.txt index df68860bec8..803f399b5bc 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefaultAndOther.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefaultAndOther.txt @@ -3,6 +3,8 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*> = ..., /*1*/ x: kotlin.Int) public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int) + public final val arg: kotlin.reflect.KClass<*> + public final val x: kotlin.Int public abstract fun arg(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/twoArgs.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/twoArgs.txt index 7c0e3f74936..81095b3c74e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/twoArgs.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/twoArgs.txt @@ -3,6 +3,8 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg1: java.lang.Class<*>, /*1*/ arg2: java.lang.Class<*>) public constructor A(/*0*/ arg1: kotlin.reflect.KClass<*>, /*1*/ arg2: kotlin.reflect.KClass<*>) + public final val arg1: kotlin.reflect.KClass<*> + public final val arg2: kotlin.reflect.KClass<*> public abstract fun arg1(): kotlin.reflect.KClass<*> public abstract fun arg2(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/value.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/value.txt index 81ac930353a..d26196e2b25 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/value.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/value.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*>) public constructor A(/*0*/ value: kotlin.reflect.KClass<*>) + public final val value: kotlin.reflect.KClass<*> 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/annotations/annotationsWithJavaLangClassParameterOverload/valueAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueAndOtherDefault.txt index fc2cecb1657..3018b0c2026 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueAndOtherDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueAndOtherDefault.txt @@ -3,6 +3,8 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*>, /*1*/ x: kotlin.Int = ...) public constructor A(/*0*/ value: kotlin.reflect.KClass<*>, /*1*/ x: kotlin.Int = ...) + public final val value: kotlin.reflect.KClass<*> + public final val x: kotlin.Int 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/annotations/annotationsWithJavaLangClassParameterOverload/valueArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueArray.txt index 118edc89aa9..ef2e0856539 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueArray.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueArray.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ vararg value: java.lang.Class<*> /*kotlin.Array>*/) public constructor A(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array>*/) + public final val value: kotlin.Array> 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/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefault.txt index 3b6dc787cd4..8cc9ce0ce87 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefault.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*> = ...) public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ...) + public final val value: kotlin.reflect.KClass<*> 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/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefaultAndOther.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefaultAndOther.txt index 5725e85d7ab..2d2ceb403a6 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefaultAndOther.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefaultAndOther.txt @@ -3,6 +3,8 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*> = ..., /*1*/ x: kotlin.Int) public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int) + public final val value: kotlin.reflect.KClass<*> + public final val x: kotlin.Int 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/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt index 34c4c67589d..a0ff1950ab8 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt @@ -3,6 +3,9 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*> = ..., /*1*/ x: kotlin.Int = ..., /*2*/ b: B) public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int = ..., /*2*/ b: B) + public final val arg: kotlin.reflect.KClass<*> + public final val b: B + public final val x: kotlin.Int public abstract fun arg(): kotlin.reflect.KClass<*> public abstract fun b(): B public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -14,6 +17,8 @@ public final annotation class A : kotlin.Annotation { public final annotation class B : kotlin.Annotation { public /*synthesized*/ constructor B(/*0*/ arg: java.lang.Class<*> = ..., /*1*/ y: kotlin.Int = ...) public constructor B(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ y: kotlin.Int = ...) + public final val arg: kotlin.reflect.KClass<*> + public final val y: kotlin.Int public abstract fun arg(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt index f66cc9e7bad..7aa13ba155e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*>) public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>) + public final val arg: kotlin.reflect.KClass<*> public abstract fun arg(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt index 323b8ab9fd0..76339fe6789 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt @@ -3,6 +3,8 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*>, /*1*/ x: kotlin.Int = ...) public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>, /*1*/ x: kotlin.Int = ...) + public final val arg: kotlin.reflect.KClass<*> + public final val x: kotlin.Int public abstract fun arg(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt index c4084501db6..2460151ecdd 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: kotlin.Array>) public constructor A(/*0*/ arg: kotlin.Array>) + public final val arg: kotlin.Array> public abstract fun arg(): kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt index 4a681ba16da..ee9c680af0b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*> = ...) public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ...) + public final val arg: kotlin.reflect.KClass<*> public abstract fun arg(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt index 0ff593c333e..3a13be46865 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt @@ -3,6 +3,8 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*> = ..., /*1*/ x: kotlin.Int) public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int) + public final val arg: kotlin.reflect.KClass<*> + public final val x: kotlin.Int public abstract fun arg(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt index 75a11292dc2..bcc19fafcf8 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt @@ -3,6 +3,8 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ arg1: java.lang.Class<*>, /*1*/ arg2: java.lang.Class<*>) public constructor A(/*0*/ arg1: kotlin.reflect.KClass<*>, /*1*/ arg2: kotlin.reflect.KClass<*>) + public final val arg1: kotlin.reflect.KClass<*> + public final val arg2: kotlin.reflect.KClass<*> public abstract fun arg1(): kotlin.reflect.KClass<*> public abstract fun arg2(): kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt index 2fda874e311..8b622f3016e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*>) public constructor A(/*0*/ value: kotlin.reflect.KClass<*>) + public final val value: kotlin.reflect.KClass<*> 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/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt index 21fde795054..ca78e648e5b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt @@ -3,6 +3,8 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*>, /*1*/ x: kotlin.Int = ...) public constructor A(/*0*/ value: kotlin.reflect.KClass<*>, /*1*/ x: kotlin.Int = ...) + public final val value: kotlin.reflect.KClass<*> + public final val x: kotlin.Int 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/annotations/javaAnnotationsWithKClassParameter/valueArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt index 54e7a5a501b..139a443d13a 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ vararg value: java.lang.Class<*> /*kotlin.Array>*/) public constructor A(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array>*/) + public final val value: kotlin.Array> 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/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt index 5e32d275cd1..933638fcd64 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt @@ -3,6 +3,7 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*> = ...) public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ...) + public final val value: kotlin.reflect.KClass<*> 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/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt index 5f7e722e999..bd250c82948 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt @@ -3,6 +3,8 @@ package public final annotation class A : kotlin.Annotation { public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*> = ..., /*1*/ x: kotlin.Int) public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int) + public final val value: kotlin.reflect.KClass<*> + public final val x: kotlin.Int 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/annotations/prohibitPositionedArgument/tooManyArgs.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt index b1f2a191b43..fa34032450a 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt @@ -4,6 +4,9 @@ A(a = false: kotlin.Boolean, b = 1.0.toDouble(): kotlin.Double, x = false: kotli public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Double, /*2*/ x: kotlin.Boolean) + public final val a: kotlin.Int + public final val b: kotlin.Double + public final val x: kotlin.Boolean public abstract fun a(): kotlin.Int public abstract fun b(): kotlin.Double public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt index 3f35ea07119..d3e04b0ec10 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt @@ -5,6 +5,9 @@ A(a = 2.0.toDouble(): kotlin.Double, b = 2.0.toDouble(): kotlin.Double, x = true public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Double, /*2*/ x: kotlin.Boolean) + public final val a: kotlin.Int + public final val b: kotlin.Double + public final val x: kotlin.Boolean public abstract fun a(): kotlin.Int public abstract fun b(): kotlin.Double public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt index 180bd979e51..2073959bce8 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt @@ -7,6 +7,10 @@ A(a = IntegerValueType(4): IntegerValueType(4), b = 3.0.toDouble(): kotlin.Doubl public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ value: kotlin.String, /*1*/ a: kotlin.Int, /*2*/ b: kotlin.Double, /*3*/ x: kotlin.Boolean) + public final val a: kotlin.Int + public final val b: kotlin.Double + public final val value: kotlin.String + public final val x: kotlin.Boolean public abstract fun a(): kotlin.Int public abstract fun b(): kotlin.Double public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt index 249c5645985..29ad2348871 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt @@ -6,6 +6,9 @@ A(a = IntegerValueType(4): IntegerValueType(4), b = 3.0.toDouble(): kotlin.Doubl public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Double, /*2*/ x: kotlin.Boolean) + public final val a: kotlin.Int + public final val b: kotlin.Double + public final val x: kotlin.Boolean public abstract fun a(): kotlin.Int public abstract fun b(): kotlin.Double public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt index 23162eb75a9..3bb0ca2a048 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt @@ -5,6 +5,7 @@ public open class AnnotatedConstructor { public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.String) + public final val value: kotlin.String public abstract fun value(): kotlin.String } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt index cd74a8014e8..042ffef19d5 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt @@ -6,6 +6,7 @@ public open class AnnotatedField { public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.String) + public final val value: kotlin.String public abstract fun value(): kotlin.String } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt index 3798d409c9f..69ee12ab6dd 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt @@ -6,6 +6,7 @@ public open class AnnotatedMethod { public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.Int) + public final val value: kotlin.Int public abstract fun value(): kotlin.Int } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt index ed12932d016..c890e96fe0d 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt @@ -6,6 +6,7 @@ public open class AnnotatedValueParameter { public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.String) + public final val value: kotlin.String public abstract fun value(): kotlin.String } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt index 675d1c89a4f..71d732de16f 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt @@ -16,32 +16,39 @@ public trait AnnotationInParam { public final annotation class MyAnnotation : kotlin.Annotation { public constructor MyAnnotation(/*0*/ value: kotlin.String) + public final val value: kotlin.String public abstract fun value(): kotlin.String } public final annotation class MyAnnotation2 : kotlin.Annotation { public constructor MyAnnotation2(/*0*/ vararg value: kotlin.String /*kotlin.Array*/) + public final val value: kotlin.Array public abstract fun value(): kotlin.Array } public final annotation class MyAnnotation3 : kotlin.Annotation { public constructor MyAnnotation3(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String) + public final val first: kotlin.String + public final val second: kotlin.String public abstract fun first(): kotlin.String public abstract fun second(): kotlin.String } public final annotation class MyAnnotationWithParam : kotlin.Annotation { public constructor MyAnnotationWithParam(/*0*/ value: test.AnnotationInParam.MyAnnotation) + public final val value: test.AnnotationInParam.MyAnnotation public abstract fun value(): test.AnnotationInParam.MyAnnotation } public final annotation class MyAnnotationWithParam2 : kotlin.Annotation { public constructor MyAnnotationWithParam2(/*0*/ value: test.AnnotationInParam.MyAnnotation2) + public final val value: test.AnnotationInParam.MyAnnotation2 public abstract fun value(): test.AnnotationInParam.MyAnnotation2 } public final annotation class MyAnnotationWithParam3 : kotlin.Annotation { public constructor MyAnnotationWithParam3(/*0*/ value: test.AnnotationInParam.MyAnnotation3) + public final val value: test.AnnotationInParam.MyAnnotation3 public abstract fun value(): test.AnnotationInParam.MyAnnotation3 } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt index a876eb5e40d..1ced10fb348 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt @@ -5,6 +5,7 @@ public open class ArithmeticExpressionInParam { public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.Int) + public final val value: kotlin.Int public abstract fun value(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt index 5b9b8c48b1b..0b8dd8bf81b 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt @@ -4,6 +4,7 @@ public trait ArrayOfEnumInParam { java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}: kotlin.Array) public final annotation class targetAnnotation : kotlin.Annotation { public constructor targetAnnotation(/*0*/ value: kotlin.String) + public final val value: kotlin.String public abstract fun value(): kotlin.String } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt index 6bf5cc4d3bc..73146d3948d 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt @@ -8,6 +8,7 @@ public trait ArrayOfStringInParam { public final annotation class MyAnnotation : kotlin.Annotation { public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array*/) + public final val value: kotlin.Array public abstract fun value(): kotlin.Array } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt index f80c3d9e18d..3a409b37fbe 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt @@ -6,6 +6,7 @@ public open class ClassObjectArrayInParam { public final annotation class Anno : kotlin.Annotation { public /*synthesized*/ constructor Anno(/*0*/ vararg value: java.lang.Class<*> /*kotlin.Array>*/) public constructor Anno(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array>*/) + public final val value: kotlin.Array> public abstract fun value(): kotlin.Array> } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt index ebf800701e0..2e6b13c6775 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt @@ -6,6 +6,7 @@ public open class ClassObjectInParam { public final annotation class Anno : kotlin.Annotation { public /*synthesized*/ constructor Anno(/*0*/ value: java.lang.Class<*>) public constructor Anno(/*0*/ value: kotlin.reflect.KClass<*>) + public final val value: kotlin.reflect.KClass<*> public abstract fun value(): kotlin.reflect.KClass<*> } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt index 8e29719e16c..a11d8e9bd45 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt @@ -6,6 +6,8 @@ public open class ClassObjectInParamRaw { public final annotation class Anno : kotlin.Annotation { public /*synthesized*/ constructor Anno(/*0*/ value: java.lang.Class<*>, /*1*/ arg: kotlin.Array>) public constructor Anno(/*0*/ value: kotlin.reflect.KClass<*>, /*1*/ arg: kotlin.Array>) + public final val arg: kotlin.Array> + public final val value: kotlin.reflect.KClass<*> public abstract fun arg(): kotlin.Array> public abstract fun value(): kotlin.reflect.KClass<*> } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt index 738f775097a..f737c1c142d 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt @@ -6,6 +6,14 @@ public open class ClassObjectInParamVariance { public final annotation class Anno : kotlin.Annotation { public /*synthesized*/ constructor Anno(/*0*/ arg1: java.lang.Class, /*1*/ arg2: java.lang.Class, /*2*/ arg3: kotlin.Array>, /*3*/ arg4: kotlin.Array>, /*4*/ arg5: kotlin.Array!>>, /*5*/ arg6: kotlin.Array!>>, /*6*/ arg7: kotlin.Array!>>, /*7*/ arg8: kotlin.Array!>>) public constructor Anno(/*0*/ arg1: kotlin.reflect.KClass, /*1*/ arg2: kotlin.reflect.KClass, /*2*/ arg3: kotlin.Array>, /*3*/ arg4: kotlin.Array>, /*4*/ arg5: kotlin.Array!>>, /*5*/ arg6: kotlin.Array!>>, /*6*/ arg7: kotlin.Array!>>, /*7*/ arg8: kotlin.Array!>>) + public final val arg1: kotlin.reflect.KClass + public final val arg2: kotlin.reflect.KClass + public final val arg3: kotlin.Array> + public final val arg4: kotlin.Array> + public final val arg5: kotlin.Array!>> + public final val arg6: kotlin.Array!>> + public final val arg7: kotlin.Array!>> + public final val arg8: kotlin.Array!>> public abstract fun arg1(): kotlin.reflect.KClass public abstract fun arg2(): kotlin.reflect.KClass public abstract fun arg3(): kotlin.Array> diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt index 01be71b25fa..37ece374eb3 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt @@ -4,6 +4,7 @@ public trait CustomAnnotation { public final annotation class MyAnnotation : kotlin.Annotation { public constructor MyAnnotation(/*0*/ value: test.CustomAnnotation.MyEnum) + public final val value: test.CustomAnnotation.MyEnum public abstract fun value(): test.CustomAnnotation.MyEnum } diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt index a0a612a9947..60c06bb3ed4 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt @@ -4,6 +4,8 @@ public trait CustomAnnotationWithDefaultParameter { public final annotation class MyAnnotation : kotlin.Annotation { public constructor MyAnnotation(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String = ...) + public final val first: kotlin.String + public final val second: kotlin.String public abstract fun first(): kotlin.String public abstract fun second(): kotlin.String } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt index 1091f4fc281..dd078940821 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt @@ -8,6 +8,7 @@ public trait EmptyArrayInParam { public final annotation class MyAnnotation : kotlin.Annotation { public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array*/) + public final val value: kotlin.Array public abstract fun value(): kotlin.Array } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt index aae9e4b0bbe..b057b0c6912 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt @@ -24,11 +24,13 @@ public open class EnumArgumentWithCustomToString { public final annotation class EnumAnno : kotlin.Annotation { public constructor EnumAnno(/*0*/ value: test.EnumArgumentWithCustomToString.E) + public final val value: test.EnumArgumentWithCustomToString.E public abstract fun value(): test.EnumArgumentWithCustomToString.E } public final annotation class EnumArrayAnno : kotlin.Annotation { public constructor EnumArrayAnno(/*0*/ vararg value: test.EnumArgumentWithCustomToString.E /*kotlin.Array*/) + public final val value: kotlin.Array public abstract fun value(): kotlin.Array } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt index 7c10eb2dc58..58273909ae1 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt @@ -16,6 +16,7 @@ public final enum class EnumConstructorParameter : kotlin.Enum) + public final val a: kotlin.String + public final val b: kotlin.Array public abstract fun a(): kotlin.String public abstract fun b(): kotlin.Array }