diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index f25116b6aef..c0a6012932a 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -289,7 +289,7 @@ public interface Comparable { public abstract operator fun compareTo(/*0*/ other: T): kotlin.Int } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() public final class Deprecated : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.MustBeDocumented() public final annotation class Deprecated : kotlin.Annotation { /*primary*/ public constructor Deprecated(/*0*/ message: kotlin.String, /*1*/ replaceWith: kotlin.ReplaceWith = ..., /*2*/ level: kotlin.DeprecationLevel = ...) public final val level: kotlin.DeprecationLevel public final fun (): kotlin.DeprecationLevel @@ -468,7 +468,7 @@ public abstract class Enum> : kotlin.Comparable { } } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() public final class Extension : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.MustBeDocumented() public final annotation class Extension : kotlin.Annotation { /*primary*/ public constructor Extension() } @@ -621,7 +621,7 @@ public interface FloatingPointConstants { public interface Function { } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented() @kotlin.Deprecated(message = "Use @Deprecated("...", level = DeprecationLevel.HIDDEN) instead", replaceWith = kotlin.ReplaceWith(expression = "@Deprecated(, level = DeprecationLevel.HIDDEN)", imports = {})) @kotlin.annotation.annotation() public final class HiddenDeclaration : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented() @kotlin.Deprecated(message = "Use @Deprecated("...", level = DeprecationLevel.HIDDEN) instead", replaceWith = kotlin.ReplaceWith(expression = "@Deprecated(, level = DeprecationLevel.HIDDEN)", imports = {})) public final annotation class HiddenDeclaration : kotlin.Annotation { /*primary*/ public constructor HiddenDeclaration() } @@ -1104,7 +1104,7 @@ public interface Range> { public open fun isEmpty(): kotlin.Boolean } -@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() public final class ReplaceWith : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented() public final annotation class ReplaceWith : kotlin.Annotation { /*primary*/ public constructor ReplaceWith(/*0*/ expression: kotlin.String, /*1*/ vararg imports: kotlin.String /*kotlin.Array*/) public final val expression: kotlin.String public final fun (): kotlin.String @@ -1265,7 +1265,7 @@ public final class String : kotlin.Comparable, kotlin.CharSequenc } } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.FIELD, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.TYPE, AnnotationTarget.EXPRESSION, AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.annotation() public final class Suppress : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.FIELD, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.TYPE, AnnotationTarget.EXPRESSION, AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final annotation class Suppress : kotlin.Annotation { /*primary*/ public constructor Suppress(/*0*/ vararg names: kotlin.String /*kotlin.Array*/) public final val names: kotlin.Array public final fun (): kotlin.Array @@ -1284,30 +1284,30 @@ public object Unit { /*primary*/ private constructor Unit() } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() public final class UnsafeVariance : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented() public final annotation class UnsafeVariance : kotlin.Annotation { /*primary*/ public constructor UnsafeVariance() } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() private final class crossinline : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.MustBeDocumented() private final annotation class crossinline : kotlin.Annotation { /*primary*/ public constructor crossinline() } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() private final class data : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.MustBeDocumented() private final annotation class data : kotlin.Annotation { /*primary*/ public constructor data() } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() private final class external : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented() private final annotation class external : kotlin.Annotation { /*primary*/ public constructor external() } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() private final class inline : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.MustBeDocumented() private final annotation class inline : kotlin.Annotation { /*primary*/ public constructor inline() } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() private final class noinline : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.MustBeDocumented() private final annotation class noinline : kotlin.Annotation { /*primary*/ public constructor noinline() } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.annotation() private final class tailrec : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) private final annotation class tailrec : kotlin.Annotation { /*primary*/ public constructor tailrec() } diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt index 63b9f3bd45e..a333cbb9acd 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt +++ b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class AAA : kotlin.Annotation { +public final annotation class AAA : kotlin.Annotation { public constructor AAA() } diff --git a/compiler/testData/compileJavaAgainstKotlin/property/ConstVal.txt b/compiler/testData/compileJavaAgainstKotlin/property/ConstVal.txt index 4395ce08599..85af54cc1e9 100644 --- a/compiler/testData/compileJavaAgainstKotlin/property/ConstVal.txt +++ b/compiler/testData/compileJavaAgainstKotlin/property/ConstVal.txt @@ -7,7 +7,7 @@ public object A { public const final val OBJECT: kotlin.String } -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ kotlin.String) public final val value: kotlin.String } diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.txt b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.txt index 168ad34e42c..84f735773b7 100644 --- a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.txt +++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.txt @@ -1,36 +1,36 @@ package test -@kotlin.annotation.annotation() public final class AByte : kotlin.Annotation { +public final annotation class AByte : kotlin.Annotation { public constructor AByte(/*0*/ kotlin.Byte) public final val value: kotlin.Byte } -@kotlin.annotation.annotation() public final class AChar : kotlin.Annotation { +public final annotation class AChar : kotlin.Annotation { public constructor AChar(/*0*/ kotlin.Char) public final val value: kotlin.Char } -@kotlin.annotation.annotation() public final class ADouble : kotlin.Annotation { +public final annotation class ADouble : kotlin.Annotation { public constructor ADouble(/*0*/ kotlin.Double) public final val value: kotlin.Double } -@kotlin.annotation.annotation() public final class AFloat : kotlin.Annotation { +public final annotation class AFloat : kotlin.Annotation { public constructor AFloat(/*0*/ kotlin.Float) public final val value: kotlin.Float } -@kotlin.annotation.annotation() public final class AInt : kotlin.Annotation { +public final annotation class AInt : kotlin.Annotation { public constructor AInt(/*0*/ kotlin.Int) public final val value: kotlin.Int } -@kotlin.annotation.annotation() public final class ALong : kotlin.Annotation { +public final annotation class ALong : kotlin.Annotation { public constructor ALong(/*0*/ kotlin.Long) public final val value: kotlin.Long } -@kotlin.annotation.annotation() public final class AString : kotlin.Annotation { +public final annotation class AString : kotlin.Annotation { public constructor AString(/*0*/ kotlin.String) public final val value: kotlin.String } diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.txt b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.txt index 78d944d5233..031ec3af900 100644 --- a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.txt +++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.txt @@ -1,36 +1,36 @@ package test -@kotlin.annotation.annotation() public final class AByte : kotlin.Annotation { +public final annotation class AByte : kotlin.Annotation { public constructor AByte(/*0*/ kotlin.Byte) public final val value: kotlin.Byte } -@kotlin.annotation.annotation() public final class AChar : kotlin.Annotation { +public final annotation class AChar : kotlin.Annotation { public constructor AChar(/*0*/ kotlin.Char) public final val value: kotlin.Char } -@kotlin.annotation.annotation() public final class ADouble : kotlin.Annotation { +public final annotation class ADouble : kotlin.Annotation { public constructor ADouble(/*0*/ kotlin.Double) public final val value: kotlin.Double } -@kotlin.annotation.annotation() public final class AFloat : kotlin.Annotation { +public final annotation class AFloat : kotlin.Annotation { public constructor AFloat(/*0*/ kotlin.Float) public final val value: kotlin.Float } -@kotlin.annotation.annotation() public final class AInt : kotlin.Annotation { +public final annotation class AInt : kotlin.Annotation { public constructor AInt(/*0*/ kotlin.Int) public final val value: kotlin.Int } -@kotlin.annotation.annotation() public final class ALong : kotlin.Annotation { +public final annotation class ALong : kotlin.Annotation { public constructor ALong(/*0*/ kotlin.Long) public final val value: kotlin.Long } -@kotlin.annotation.annotation() public final class AString : kotlin.Annotation { +public final annotation class AString : kotlin.Annotation { public constructor AString(/*0*/ kotlin.String) public final val value: kotlin.String } diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.txt b/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.txt index ad621277a3a..ae300c1e16c 100644 --- a/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.txt +++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.txt @@ -12,7 +12,7 @@ public final class KotlinClass { public open class kt3698 { public constructor kt3698() - public/*package*/ final class Foo : kotlin.Annotation { + public/*package*/ final annotation class Foo : kotlin.Annotation { public/*package*/ constructor Foo(/*0*/ kotlin.Int) public final val value: kotlin.Int } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt b/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt index bb99cdfd382..02adc0cecf4 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt @@ -1,9 +1,9 @@ package test -@test.meta() public/*package*/ final class MyAnn : kotlin.Annotation { +@test.meta() public/*package*/ final annotation class MyAnn : kotlin.Annotation { public/*package*/ constructor MyAnn() } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) @kotlin.annotation.annotation() public final class meta : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final annotation class meta : kotlin.Annotation { public constructor meta() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/base.txt b/compiler/testData/compileJavaAgainstKotlin/targets/base.txt index 0551a5f674a..6255d54b94c 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/base.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/base.txt @@ -5,6 +5,6 @@ package test @test.base() public/*package*/ open fun foo(/*0*/ @test.base() kotlin.Int): kotlin.Int } -@kotlin.annotation.annotation() public final class base : kotlin.Annotation { +public final annotation class base : kotlin.Annotation { public constructor base() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt b/compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt index e3df79fbc4d..c711308bb61 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.annotation() public final class classifier : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class classifier : kotlin.Annotation { public constructor classifier() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt b/compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt index c268229bf0e..f90171d8094 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) @kotlin.annotation.annotation() public final class constructor : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) public final annotation class constructor : kotlin.Annotation { public constructor constructor() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/empty.txt b/compiler/testData/compileJavaAgainstKotlin/targets/empty.txt index 90a46dd8f2a..ce0d54a407e 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/empty.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/empty.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.annotation() public final class empty : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {}) public final annotation class empty : kotlin.Annotation { public constructor empty() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/field.txt b/compiler/testData/compileJavaAgainstKotlin/targets/field.txt index 739fb2f93fb..e554e509478 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/field.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/field.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD}) @kotlin.annotation.annotation() public final class field : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD}) public final annotation class field : kotlin.Annotation { public constructor field() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/function.txt b/compiler/testData/compileJavaAgainstKotlin/targets/function.txt index 26da1f0fd18..f9219a9c1ca 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/function.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/function.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) @kotlin.annotation.annotation() public final class function : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) public final annotation class function : kotlin.Annotation { public constructor function() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/getter.txt b/compiler/testData/compileJavaAgainstKotlin/targets/getter.txt index d05c425ff52..d7a170d22ff 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/getter.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/getter.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.annotation() public final class getter : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) public final annotation class getter : kotlin.Annotation { public constructor getter() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/local.txt b/compiler/testData/compileJavaAgainstKotlin/targets/local.txt index f9a1f101bfb..3420731824c 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/local.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/local.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) @kotlin.annotation.annotation() public final class local : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) public final annotation class local : kotlin.Annotation { public constructor local() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt b/compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt index f41ba89cd29..f46c55da0d6 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION}) @kotlin.annotation.annotation() public final class multiple : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION}) public final annotation class multiple : kotlin.Annotation { public constructor multiple() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt b/compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt index 282dca0c64d..4a9fd968571 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) @kotlin.annotation.annotation() public final class parameter : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final annotation class parameter : kotlin.Annotation { public constructor parameter() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/property.txt b/compiler/testData/compileJavaAgainstKotlin/targets/property.txt index ac78c295adc..a1c305559f7 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/property.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/property.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY}) @kotlin.annotation.annotation() public final class property : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY}) public final annotation class property : kotlin.Annotation { public constructor property() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/setter.txt b/compiler/testData/compileJavaAgainstKotlin/targets/setter.txt index c98ab0de902..e136a7d67ab 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/setter.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/setter.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) @kotlin.annotation.annotation() public final class setter : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) public final annotation class setter : kotlin.Annotation { public constructor setter() } diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.txt index 741a6aa59d4..fe09641b246 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ e: [ERROR : test.E]) public final val e: [ERROR : test.E] } diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt index 444a5489159..88627f0624c 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt @@ -8,7 +8,7 @@ public final class Annotated { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann() 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/tests/annotations/AnnotatedLocalObjectFun.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectFun.txt index 428c943db4d..6376bc5a160 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectFun.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectFun.txt @@ -2,7 +2,7 @@ package public fun foo(): kotlin.Unit -@kotlin.annotation.annotation() public final class My : kotlin.Annotation { +public final annotation class My : kotlin.Annotation { public constructor My() 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/tests/annotations/AnnotatedLocalObjectProperty.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectProperty.txt index f41259c2831..6835c4b8748 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectProperty.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectProperty.txt @@ -2,7 +2,7 @@ package public fun foo(): kotlin.Int -@kotlin.annotation.annotation() public final class My : kotlin.Annotation { +public final annotation class My : kotlin.Annotation { public constructor My() 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/tests/annotations/AnnotatedLoop.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedLoop.txt index cebf0e0f098..a9679d1f65e 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotatedLoop.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedLoop.txt @@ -2,7 +2,7 @@ package public fun foo(): kotlin.Unit -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class My : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class My : kotlin.Annotation { public constructor My() 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/tests/annotations/AnnotatedResultType.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.txt index fa3bd47901f..3c95914fa83 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.txt @@ -2,7 +2,7 @@ package public fun foo(): @My(x = 42) kotlin.Int -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class My : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class My : kotlin.Annotation { public constructor My(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.txt index 1cbe30feb2c..c1921dd28d2 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.txt @@ -2,7 +2,7 @@ package public fun foo(/*0*/ arg: kotlin.Int): kotlin.Int -@kotlin.annotation.annotation() public final class My : kotlin.Annotation { +public final annotation class My : kotlin.Annotation { public constructor My() 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/tests/annotations/AnnotationAsDefaultParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.txt index adb513197c1..1ae4abcebea 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Base : kotlin.Annotation { +public final annotation class Base : kotlin.Annotation { public constructor Base(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -15,7 +15,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class UseBase : kotlin.Annotation { +public final annotation class UseBase : kotlin.Annotation { public constructor UseBase(/*0*/ b: Base = ...) public final val b: Base public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.txt index a312a96d235..d3aa6c01a54 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.txt @@ -1,13 +1,13 @@ package -@kotlin.annotation.annotation() public final class A1 : kotlin.Annotation { +public final annotation class A1 : kotlin.Annotation { public constructor A1() 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 } -@kotlin.annotation.annotation() public final class A2 : kotlin.Annotation { +public final annotation class A2 : kotlin.Annotation { public constructor A2(/*0*/ some: kotlin.Int = ...) public final val some: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.txt index d3818cdc5e4..105d609e4f0 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.txt @@ -2,14 +2,14 @@ package public fun topFun(): kotlin.Int -@kotlin.annotation.annotation() public final class A1 : kotlin.Annotation { +public final annotation class A1 : kotlin.Annotation { public constructor A1() 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 } -@kotlin.annotation.annotation() public final class A2 : kotlin.Annotation { +public final annotation class A2 : kotlin.Annotation { public constructor A2(/*0*/ some: kotlin.Int = ...) public final val some: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationIdentifier.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationIdentifier.txt index 8f8e1758c03..7f63c59a3da 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotationIdentifier.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotationIdentifier.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class annotation : kotlin.Annotation { +public final annotation class annotation : kotlin.Annotation { public constructor annotation() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -9,7 +9,7 @@ package package other { - @kotlin.annotation.annotation() public final class My : kotlin.Annotation { + public final annotation class My : kotlin.Annotation { public constructor My() 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/tests/annotations/AnnotationOnObject.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationOnObject.txt index 9b07e9d8122..a750322ba63 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotationOnObject.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotationOnObject.txt @@ -2,7 +2,7 @@ package package test { - @kotlin.annotation.annotation() public final class A : kotlin.Annotation { + public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ a: kotlin.Int = ..., /*1*/ b: kotlin.String = ..., /*2*/ c: kotlin.String) public final val a: kotlin.Int public final val b: kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.txt index a63effc4fb7..0124c9824ce 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.txt @@ -1,6 +1,6 @@ package -@java.lang.Deprecated() @kotlin.annotation.annotation() public final class my : kotlin.Annotation { +@java.lang.Deprecated() public final annotation class my : kotlin.Annotation { public constructor my() 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/tests/annotations/AnnotationsForPropertyTypeParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt index 23daa6d70cc..5fbd6594f40 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt @@ -2,14 +2,14 @@ package public val T.topProp: kotlin.Int -@kotlin.annotation.annotation() public final class A1 : kotlin.Annotation { +public final annotation class A1 : kotlin.Annotation { public constructor A1() 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 } -@kotlin.annotation.annotation() public final class A2 : kotlin.Annotation { +public final annotation class A2 : kotlin.Annotation { public constructor A2(/*0*/ some: kotlin.Int = ...) public final val some: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt index 0a51ba48041..c59ea42cd60 100644 --- a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt +++ b/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt @@ -7,14 +7,14 @@ package @my2() public fun foo41(): kotlin.Unit @my2(i = 2) public fun foo42(): kotlin.Unit -@kotlin.annotation.annotation() public final class my : kotlin.Annotation { +public final annotation class my : kotlin.Annotation { public constructor my() 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 } -@kotlin.annotation.annotation() public final class my1 : kotlin.Annotation { +public final annotation class my1 : kotlin.Annotation { public constructor my1(/*0*/ i: kotlin.Int) public final val i: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -22,7 +22,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class my2 : kotlin.Annotation { +public final annotation class my2 : kotlin.Annotation { public constructor my2(/*0*/ i: kotlin.Int = ...) public final val i: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.txt b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.txt index cbd95461381..e1cee8f0b7e 100644 --- a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.txt +++ b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.txt @@ -7,14 +7,14 @@ public fun foo(): kotlin.Unit public fun javaClass(): java.lang.Class public operator fun kotlin.String.invoke(): kotlin.Unit -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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 } -@kotlin.annotation.annotation() public final class Ann1 : kotlin.Annotation { +public final annotation class Ann1 : kotlin.Annotation { public constructor Ann1(/*0*/ a: kotlin.Int) public final val a: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -22,7 +22,7 @@ public operator fun kotlin.String.invoke(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann2 : kotlin.Annotation { +public final annotation class Ann2 : kotlin.Annotation { public constructor Ann2(/*0*/ a: Ann1) public final val a: Ann1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -30,7 +30,7 @@ public operator fun kotlin.String.invoke(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann3 : kotlin.Annotation { +public final annotation class Ann3 : kotlin.Annotation { public constructor Ann3(/*0*/ a: Ann1 = ...) public final val a: Ann1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -38,7 +38,7 @@ public operator fun kotlin.String.invoke(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann4 : kotlin.Annotation { +public final annotation class Ann4 : kotlin.Annotation { public constructor Ann4(/*0*/ value: kotlin.String) public final val value: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/DanglingMixed.txt b/compiler/testData/diagnostics/tests/annotations/DanglingMixed.txt index 77481206fa9..dc8aaf388b7 100644 --- a/compiler/testData/diagnostics/tests/annotations/DanglingMixed.txt +++ b/compiler/testData/diagnostics/tests/annotations/DanglingMixed.txt @@ -1,13 +1,13 @@ package -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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 } -@kotlin.annotation.annotation() public final class Ann2 : kotlin.Annotation { +public final annotation class Ann2 : kotlin.Annotation { public constructor Ann2() 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/tests/annotations/DanglingNoBrackets.txt b/compiler/testData/diagnostics/tests/annotations/DanglingNoBrackets.txt index 4fa18b7ea11..6447c21a282 100644 --- a/compiler/testData/diagnostics/tests/annotations/DanglingNoBrackets.txt +++ b/compiler/testData/diagnostics/tests/annotations/DanglingNoBrackets.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/annotations/DanglingWithBrackets.txt b/compiler/testData/diagnostics/tests/annotations/DanglingWithBrackets.txt index 109a16ff53c..c98a97f5c45 100644 --- a/compiler/testData/diagnostics/tests/annotations/DanglingWithBrackets.txt +++ b/compiler/testData/diagnostics/tests/annotations/DanglingWithBrackets.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/annotations/JavaAnnotationConstructors.txt b/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt index 2448f2df1fa..ae899e89677 100644 --- a/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt +++ b/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt @@ -1,13 +1,13 @@ package -@java.lang.annotation.Retention(value = RetentionPolicy.CLASS) @kotlin.annotation.annotation() public final class my : kotlin.Annotation { +@java.lang.annotation.Retention(value = RetentionPolicy.CLASS) public final annotation class my : kotlin.Annotation { public constructor my() 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 } -@java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME) @java.lang.annotation.Target(value = {ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR}) @kotlin.annotation.annotation() public final class my1 : kotlin.Annotation { +@java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME) @java.lang.annotation.Target(value = {ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR}) public final annotation class my1 : kotlin.Annotation { public constructor my1() 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/tests/annotations/MultiDeclaration.txt b/compiler/testData/diagnostics/tests/annotations/MultiDeclaration.txt index b93e1a73a35..636d002c734 100644 --- a/compiler/testData/diagnostics/tests/annotations/MultiDeclaration.txt +++ b/compiler/testData/diagnostics/tests/annotations/MultiDeclaration.txt @@ -2,7 +2,7 @@ package public fun foo(): kotlin.Int -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt b/compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt index 4e0ebe0071f..c21ed33d38e 100644 --- a/compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt +++ b/compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt @@ -3,7 +3,7 @@ package @ann() public fun bar(): kotlin.Int @ann() public fun foo(): kotlin.Int -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotated.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotated.txt index 8e92893cebe..5f9f9ad726a 100644 --- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotated.txt +++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotated.txt @@ -1,6 +1,6 @@ package -@RecursivelyAnnotated(x = 1) @kotlin.annotation.annotation() public final class RecursivelyAnnotated : kotlin.Annotation { +@RecursivelyAnnotated(x = 1) public final annotation class RecursivelyAnnotated : kotlin.Annotation { public constructor RecursivelyAnnotated(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.txt index a3c5e04f5fd..58c1bcaeff8 100644 --- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.txt +++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.txt @@ -2,7 +2,7 @@ package public fun foo(/*0*/ @ann() x: kotlin.Int): kotlin.Int -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt index a804de343c3..e5154d45912 100644 --- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt +++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt @@ -2,7 +2,7 @@ package @ann() public fun foo(): kotlin.Int -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalProperty.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalProperty.txt index 2340f83fb54..e686d941108 100644 --- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalProperty.txt +++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalProperty.txt @@ -2,7 +2,7 @@ package @ann(x = 1) public const val x: kotlin.Int = 1 -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameter.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameter.txt index 18df7a3bf97..795f9cb0f37 100644 --- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameter.txt +++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameter.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class RecursivelyAnnotated : kotlin.Annotation { +public final annotation class RecursivelyAnnotated : kotlin.Annotation { public constructor RecursivelyAnnotated(/*0*/ @RecursivelyAnnotated(x = 1) x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt index d294a813a4d..c5582197634 100644 --- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt +++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class RecursivelyAnnotated : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class RecursivelyAnnotated : kotlin.Annotation { public constructor RecursivelyAnnotated(/*0*/ x: @RecursivelyAnnotated(x = 1) kotlin.Int) public final val x: @RecursivelyAnnotated(x = 1) kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterWithAt.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterWithAt.txt index 18df7a3bf97..795f9cb0f37 100644 --- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterWithAt.txt +++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterWithAt.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class RecursivelyAnnotated : kotlin.Annotation { +public final annotation class RecursivelyAnnotated : kotlin.Annotation { public constructor RecursivelyAnnotated(/*0*/ @RecursivelyAnnotated(x = 1) x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedProperty.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedProperty.txt index 32da3851bbe..4ce15c0463c 100644 --- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedProperty.txt +++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedProperty.txt @@ -8,7 +8,7 @@ public final class My { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt b/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt index 23df6edf3a3..fa05787a9d5 100644 --- a/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt +++ b/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt @@ -3,7 +3,7 @@ package package test { public val some: test.SomeObject - @kotlin.annotation.annotation() public final class BadAnnotation : kotlin.Annotation { + public final annotation class BadAnnotation : kotlin.Annotation { public constructor BadAnnotation(/*0*/ s: kotlin.String) public final val s: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/annotationInheritance.txt b/compiler/testData/diagnostics/tests/annotations/annotationInheritance.txt index 8b6d7d30e67..06531dfb8ec 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationInheritance.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationInheritance.txt @@ -2,28 +2,28 @@ package public val a: T -@kotlin.annotation.annotation() public final class Ann : C { +public final annotation class Ann : C { public constructor Ann() 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 } -@kotlin.annotation.annotation() public final class Ann2 : T { +public final annotation class Ann2 : T { public constructor Ann2() 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 } -@kotlin.annotation.annotation() public final class Ann3 : T { +public final annotation class Ann3 : T { public constructor Ann3() 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 } -@kotlin.annotation.annotation() public final class Ann4 : C, T { +public final annotation class Ann4 : C, T { public constructor Ann4() public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt b/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt index 67b1a41bf74..3880712816e 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt @@ -1,8 +1,8 @@ package -@kotlin.annotation.annotation() public val x: kotlin.Int = 0 -@kotlin.annotation.annotation() public var y: kotlin.Int -@kotlin.annotation.annotation() public fun f(): kotlin.Int +public val x: kotlin.Int = 0 +public var y: kotlin.Int +public fun f(): kotlin.Int public final class A { public constructor A() @@ -10,7 +10,7 @@ public final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - @kotlin.annotation.annotation() public companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -18,21 +18,21 @@ public final class A { } } -@kotlin.annotation.annotation() public final class B : kotlin.Annotation { +public final annotation class B : kotlin.Annotation { public constructor B() 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 } -@kotlin.annotation.annotation() public object O { +public object O { private constructor O() 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 } -@kotlin.annotation.annotation() public interface T { +public interface T { 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/tests/annotations/annotationOnParameterInFunctionType.txt b/compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.txt index aac4c352255..b4fea6f7bc5 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.txt @@ -17,14 +17,14 @@ public final class A : (kotlin.Int) -> kotlin.Unit { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class TypeAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class TypeAnn : kotlin.Annotation { public constructor TypeAnn() 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/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.txt index 17f8780e104..5444762ced0 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.txt @@ -2,7 +2,7 @@ package public fun foo(): kotlin.Unit -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ vararg i: kotlin.Boolean /*kotlin.BooleanArray*/) public final val i: kotlin.BooleanArray public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.txt index 17f8780e104..5444762ced0 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.txt @@ -2,7 +2,7 @@ package public fun foo(): kotlin.Unit -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ vararg i: kotlin.Boolean /*kotlin.BooleanArray*/) public final val i: kotlin.BooleanArray public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt index c1bfcdeb7e9..ccb9f6a514e 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt @@ -2,7 +2,7 @@ package public val e: MyEnum -@kotlin.annotation.annotation() public final class AnnE : kotlin.Annotation { +public final annotation class AnnE : kotlin.Annotation { public constructor AnnE(/*0*/ i: MyEnum) public final val i: MyEnum public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.txt index 746bfd5aaaa..3b3bb892e73 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.txt @@ -7,7 +7,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ vararg i: kotlin.Int /*kotlin.IntArray*/) public final val i: kotlin.IntArray public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.txt index 0b2ed7a8122..5bf8e356d9d 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.txt @@ -7,7 +7,7 @@ public const val i4: kotlin.Int = 1 public var i5: kotlin.Int public var i6: kotlin.Int -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ vararg i: kotlin.Int /*kotlin.IntArray*/) public final val i: kotlin.IntArray public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt index cf2e202495c..4cc2f288faa 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt @@ -3,7 +3,7 @@ package public const val topLevel: kotlin.String = "topLevel" public fun foo(): kotlin.Unit -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ vararg i: kotlin.String /*kotlin.Array*/) public final val i: kotlin.Array public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt b/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt index c483735e94d..7af08752946 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt @@ -3,7 +3,7 @@ package @kotlin.inline() public fun bar(/*0*/ block: () -> kotlin.Int): kotlin.Int public fun foo(): kotlin.Unit -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ x: kotlin.Int = ...) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt b/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt index 671d01f0450..cabf4460f0e 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt @@ -17,14 +17,14 @@ public fun @b(i = 1) kotlin.Int?.bar1(): kotlin.Unit public fun @a() @b(i = 1) kotlin.Int?.bar2(): kotlin.Unit public fun @c() kotlin.Int?.bar3(): kotlin.Unit -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class a : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class a : kotlin.Annotation { public constructor a() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class b : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class b : kotlin.Annotation { public constructor b(/*0*/ i: kotlin.Int) public final val i: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -32,7 +32,7 @@ public fun @c() kotlin.Int?.bar3(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class c : kotlin.Annotation { +public final annotation class c : kotlin.Annotation { public constructor c() 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/tests/annotations/atAnnotationResolve.txt b/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt index 15ac40109ed..651a14f8331 100644 --- a/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt +++ b/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt @@ -10,7 +10,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.EXPRESSION, AnnotationTarget.PROPERTY}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.EXPRESSION, AnnotationTarget.PROPERTY}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ x: kotlin.Int = ...) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt b/compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt index 86e30fee234..ce3b233ff88 100644 --- a/compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt +++ b/compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt @@ -10,7 +10,7 @@ public interface Some { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class ann : kotlin.Annotation { public constructor ann() 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/tests/annotations/forParameterAnnotationResolve.txt b/compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.txt index a7878801ed0..ada91290c6f 100644 --- a/compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.txt +++ b/compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.txt @@ -15,7 +15,7 @@ public final data class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt index 9665d0b7204..be8c3d48ba2 100644 --- a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt +++ b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt @@ -2,7 +2,7 @@ package package test { - @kotlin.annotation.annotation() public final class Ann1 : kotlin.Annotation { + public final annotation class Ann1 : kotlin.Annotation { public constructor Ann1(/*0*/ p1: kotlin.Int, /*1*/ p2: kotlin.Byte, /*2*/ p3: kotlin.Short, /*3*/ p4: kotlin.Long, /*4*/ p5: kotlin.Double, /*5*/ p6: kotlin.Float, /*6*/ p7: kotlin.Char, /*7*/ p8: kotlin.Boolean) public final val p1: kotlin.Int public final val p2: kotlin.Byte @@ -17,7 +17,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class Ann2 : kotlin.Annotation { + public final annotation class Ann2 : kotlin.Annotation { public constructor Ann2(/*0*/ p1: kotlin.String) public final val p1: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -25,7 +25,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class Ann3 : kotlin.Annotation { + public final annotation class Ann3 : kotlin.Annotation { public constructor Ann3(/*0*/ p1: test.Ann1) public final val p1: test.Ann1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -33,7 +33,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class Ann4 : kotlin.Annotation { + public final annotation class Ann4 : kotlin.Annotation { public constructor Ann4(/*0*/ p1: kotlin.IntArray, /*1*/ p2: kotlin.ByteArray, /*2*/ p3: kotlin.ShortArray, /*3*/ p4: kotlin.LongArray, /*4*/ p5: kotlin.DoubleArray, /*5*/ p6: kotlin.FloatArray, /*6*/ p7: kotlin.CharArray, /*7*/ p8: kotlin.BooleanArray) public final val p1: kotlin.IntArray public final val p2: kotlin.ByteArray @@ -48,7 +48,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class Ann5 : kotlin.Annotation { + public final annotation class Ann5 : kotlin.Annotation { public constructor Ann5(/*0*/ p1: test.MyEnum) public final val p1: test.MyEnum public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -56,7 +56,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class Ann6 : kotlin.Annotation { + public final annotation class Ann6 : kotlin.Annotation { public constructor Ann6(/*0*/ p: java.lang.Class<*>) public final val p: java.lang.Class<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -64,7 +64,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class Ann7 : kotlin.Annotation { + public final annotation class Ann7 : kotlin.Annotation { public constructor Ann7(/*0*/ p: java.lang.annotation.RetentionPolicy) public final val p: java.lang.annotation.RetentionPolicy public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -72,7 +72,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class Ann8 : kotlin.Annotation { + public final annotation class Ann8 : kotlin.Annotation { public constructor Ann8(/*0*/ p1: kotlin.Array, /*1*/ p2: kotlin.Array>, /*2*/ p3: kotlin.Array, /*3*/ p4: kotlin.Array) public final val p1: kotlin.Array public final val p2: kotlin.Array> @@ -83,7 +83,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class Ann9 : kotlin.Annotation { + public final annotation class Ann9 : kotlin.Annotation { public constructor Ann9(/*0*/ vararg p1: kotlin.String /*kotlin.Array*/, /*1*/ vararg p2: java.lang.Class<*> /*kotlin.Array>*/, /*2*/ vararg p3: test.MyEnum /*kotlin.Array*/, /*3*/ vararg p4: test.Ann1 /*kotlin.Array*/, /*4*/ vararg p5: kotlin.Int /*kotlin.IntArray*/) public final val p1: kotlin.Array public final val p2: kotlin.Array> @@ -95,7 +95,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class InAnn1 : kotlin.Annotation { + public final annotation class InAnn1 : kotlin.Annotation { public constructor InAnn1(/*0*/ p1: kotlin.Int?, /*1*/ p3: kotlin.Short?, /*2*/ p4: kotlin.Long?, /*3*/ p5: kotlin.Double?, /*4*/ p6: kotlin.Float?, /*5*/ p7: kotlin.Char?, /*6*/ p8: kotlin.Boolean?) public final val p1: kotlin.Int? public final val p3: kotlin.Short? @@ -109,7 +109,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class InAnn10 : kotlin.Annotation { + public final annotation class InAnn10 : kotlin.Annotation { public constructor InAnn10(/*0*/ p1: kotlin.String?) public final val p1: kotlin.String? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -117,7 +117,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class InAnn11 : kotlin.Annotation { + public final annotation class InAnn11 : kotlin.Annotation { public constructor InAnn11(/*0*/ p1: test.Ann1?) public final val p1: test.Ann1? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -125,7 +125,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class InAnn12 : kotlin.Annotation { + public final annotation class InAnn12 : kotlin.Annotation { public constructor InAnn12(/*0*/ p1: test.MyEnum?) public final val p1: test.MyEnum? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -133,7 +133,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class InAnn4 : kotlin.Annotation { + public final annotation class InAnn4 : kotlin.Annotation { public constructor InAnn4(/*0*/ p1: kotlin.Array, /*1*/ p2: kotlin.Array?) public final val p1: kotlin.Array public final val p2: kotlin.Array? @@ -142,7 +142,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class InAnn6 : kotlin.Annotation { + public final annotation class InAnn6 : kotlin.Annotation { public constructor InAnn6(/*0*/ p: java.lang.Class<*>?) public final val p: java.lang.Class<*>? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -150,7 +150,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class InAnn7 : kotlin.Annotation { + public final annotation class InAnn7 : kotlin.Annotation { public constructor InAnn7(/*0*/ p: java.lang.annotation.RetentionPolicy?) public final val p: java.lang.annotation.RetentionPolicy? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -158,7 +158,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class InAnn8 : kotlin.Annotation { + public final annotation class InAnn8 : kotlin.Annotation { public constructor InAnn8(/*0*/ p1: kotlin.Array, /*1*/ p2: kotlin.Array, /*2*/ p3: kotlin.Array, /*3*/ p4: kotlin.Array) public final val p1: kotlin.Array public final val p2: kotlin.Array @@ -169,7 +169,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class InAnn9 : kotlin.Annotation { + public final annotation class InAnn9 : kotlin.Annotation { public constructor InAnn9(/*0*/ p: test.MyClass) public final val p: test.MyClass public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt index 1feed49022e..40dba668e6c 100644 --- a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt +++ b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt @@ -11,7 +11,7 @@ public final class Hello { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION}) @kotlin.annotation.annotation() public final class test : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION}) public final annotation class test : kotlin.Annotation { public constructor test() 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/tests/annotations/kt1886annotationBody.txt b/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt index c4e0a915fa2..57776614ef0 100644 --- a/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt +++ b/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt @@ -1,20 +1,20 @@ package -@kotlin.annotation.annotation() public final class Annotation1 : kotlin.Annotation { +public final annotation class Annotation1 : kotlin.Annotation { public constructor Annotation1() 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 } -@kotlin.annotation.annotation() public final class Annotation10 : kotlin.Annotation { +public final annotation class Annotation10 : kotlin.Annotation { public constructor Annotation10() 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 } -@kotlin.annotation.annotation() public final class Annotation2 : kotlin.Annotation { +public final annotation class Annotation2 : kotlin.Annotation { public constructor Annotation2() public final val s: kotlin.String = "" public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -22,7 +22,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Annotation3 : kotlin.Annotation { +public final annotation class Annotation3 : kotlin.Annotation { public constructor Annotation3() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final fun foo(): kotlin.Unit @@ -30,7 +30,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Annotation4 : kotlin.Annotation { +public final annotation class Annotation4 : kotlin.Annotation { public constructor Annotation4() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -44,7 +44,7 @@ package } } -@kotlin.annotation.annotation() public final class Annotation5 : kotlin.Annotation { +public final annotation class Annotation5 : kotlin.Annotation { public constructor Annotation5() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -58,14 +58,14 @@ package } } -@kotlin.annotation.annotation() public final class Annotation6 : kotlin.Annotation { +public final annotation class Annotation6 : kotlin.Annotation { public constructor Annotation6() 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 } -@kotlin.annotation.annotation() public final class Annotation7 : kotlin.Annotation { +public final annotation class Annotation7 : kotlin.Annotation { public constructor Annotation7(/*0*/ name: kotlin.String) public final val name: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -73,7 +73,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Annotation8 : kotlin.Annotation { +public final annotation class Annotation8 : kotlin.Annotation { public constructor Annotation8(/*0*/ name: kotlin.String = ...) public final var name: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -81,7 +81,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Annotation9 : kotlin.Annotation { +public final annotation class Annotation9 : kotlin.Annotation { public constructor Annotation9(/*0*/ name: kotlin.String) public final val name: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/missingValOnParameter.txt b/compiler/testData/diagnostics/tests/annotations/missingValOnParameter.txt index 9de82ba0434..f89c06896cc 100644 --- a/compiler/testData/diagnostics/tests/annotations/missingValOnParameter.txt +++ b/compiler/testData/diagnostics/tests/annotations/missingValOnParameter.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int, /*2*/ c: kotlin.String) public final val a: kotlin.Int public final var b: kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/noNameProperty.txt b/compiler/testData/diagnostics/tests/annotations/noNameProperty.txt index 283b19f10d6..9e665a295ea 100644 --- a/compiler/testData/diagnostics/tests/annotations/noNameProperty.txt +++ b/compiler/testData/diagnostics/tests/annotations/noNameProperty.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ x: kotlin.Int, /*1*/ : [ERROR : Type annotation was missing for parameter ]) public final val : [ERROR : Annotation is absent] public final val x: kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/onExpression.txt b/compiler/testData/diagnostics/tests/annotations/onExpression.txt index 3f8f644d0a6..cdec0d920e9 100644 --- a/compiler/testData/diagnostics/tests/annotations/onExpression.txt +++ b/compiler/testData/diagnostics/tests/annotations/onExpression.txt @@ -2,7 +2,7 @@ package public fun foo(): kotlin.Int -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class ann : kotlin.Annotation { public constructor ann() 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/tests/annotations/onFunctionParameter.txt b/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt index 9bd4f8995db..b45c8e56e43 100644 --- a/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt +++ b/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt @@ -3,7 +3,7 @@ package public val bar: (kotlin.Int) -> kotlin.Unit public fun test(/*0*/ @ann() p: kotlin.Int): kotlin.Unit -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann() 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/tests/annotations/onInitializer.txt b/compiler/testData/diagnostics/tests/annotations/onInitializer.txt index 9568a82f7c4..1e02ab32bfa 100644 --- a/compiler/testData/diagnostics/tests/annotations/onInitializer.txt +++ b/compiler/testData/diagnostics/tests/annotations/onInitializer.txt @@ -13,7 +13,7 @@ public interface T { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann() 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/tests/annotations/onLoops.txt b/compiler/testData/diagnostics/tests/annotations/onLoops.txt index dd4869ee518..60c6093b294 100644 --- a/compiler/testData/diagnostics/tests/annotations/onLoops.txt +++ b/compiler/testData/diagnostics/tests/annotations/onLoops.txt @@ -2,7 +2,7 @@ package public fun test(): kotlin.Unit -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann() 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/tests/annotations/onLoopsUnreachable.txt b/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.txt index dd4869ee518..60c6093b294 100644 --- a/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.txt +++ b/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.txt @@ -2,7 +2,7 @@ package public fun test(): kotlin.Unit -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann() 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/tests/annotations/onMultiDeclaration.txt b/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.txt index a494874ff94..131183079b8 100644 --- a/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.txt +++ b/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.txt @@ -14,7 +14,7 @@ public final data class P { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann() 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/tests/annotations/options/assignment.txt b/compiler/testData/diagnostics/tests/annotations/options/assignment.txt index c076523e7bf..3cf8fa06393 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/assignment.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/assignment.txt @@ -2,7 +2,7 @@ package public fun foo(): kotlin.Int -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.annotation() public final class ExprAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class ExprAnn : kotlin.Annotation { public constructor ExprAnn() 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/tests/annotations/options/documented.txt b/compiler/testData/diagnostics/tests/annotations/options/documented.txt index 003edbbd30a..cf7b8a4b8b9 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/documented.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/documented.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() public final class DocAnn : kotlin.Annotation { +@kotlin.annotation.MustBeDocumented() public final annotation class DocAnn : kotlin.Annotation { public constructor DocAnn() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -14,7 +14,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class NotDocAnn : kotlin.Annotation { +public final annotation class NotDocAnn : kotlin.Annotation { public constructor NotDocAnn() 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/tests/annotations/options/forParam.txt b/compiler/testData/diagnostics/tests/annotations/options/forParam.txt index c507e596387..2cc53ec9630 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/forParam.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/forParam.txt @@ -2,7 +2,7 @@ package public fun foo(): kotlin.Unit -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/annotations/options/functionExpression.txt b/compiler/testData/diagnostics/tests/annotations/options/functionExpression.txt index 61f00b2a86b..e3a7f0b8b29 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/functionExpression.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/functionExpression.txt @@ -2,14 +2,14 @@ package public fun foo(): kotlin.Int -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.annotation() public final class ExprAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class ExprAnn : kotlin.Annotation { public constructor ExprAnn() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) @kotlin.annotation.annotation() public final class FunAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) public final annotation class FunAnn : kotlin.Annotation { public constructor FunAnn() 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/tests/annotations/options/functions.txt b/compiler/testData/diagnostics/tests/annotations/options/functions.txt index b2ede3bdbdb..f15169c62ce 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/functions.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/functions.txt @@ -6,21 +6,21 @@ public fun bar(/*0*/ arg: () -> kotlin.Int): kotlin.Int public fun foo(/*0*/ arg: kotlin.Int): kotlin.Unit @FunAnn() public fun gav(): kotlin.Int -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.annotation() public final class ExprAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class ExprAnn : kotlin.Annotation { public constructor ExprAnn() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) @kotlin.annotation.annotation() public final class FunAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) public final annotation class FunAnn : kotlin.Annotation { public constructor FunAnn() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.annotation() public final class SourceAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final annotation class SourceAnn : kotlin.Annotation { public constructor SourceAnn() 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/tests/annotations/options/javaDocumented.txt b/compiler/testData/diagnostics/tests/annotations/options/javaDocumented.txt index eae1bb1b836..7122c81ac6a 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/javaDocumented.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/javaDocumented.txt @@ -6,21 +6,21 @@ public open class DocumentedAnnotations { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - @kotlin.annotation.MustBeDocumented() public final class DocAnn : kotlin.Annotation { + @kotlin.annotation.MustBeDocumented() public final annotation class DocAnn : kotlin.Annotation { public constructor DocAnn() 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 } - public final class NotDocAnn : kotlin.Annotation { + public final annotation class NotDocAnn : kotlin.Annotation { public constructor NotDocAnn() 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 } - @kotlin.annotation.MustBeDocumented() @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final class RunDocAnn : kotlin.Annotation { + @kotlin.annotation.MustBeDocumented() @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class RunDocAnn : kotlin.Annotation { public constructor RunDocAnn() 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/tests/annotations/options/javaKotlinTargetRetention.txt b/compiler/testData/diagnostics/tests/annotations/options/javaKotlinTargetRetention.txt index adbb8cce528..7708bb1a7a6 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/javaKotlinTargetRetention.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/javaKotlinTargetRetention.txt @@ -1,13 +1,13 @@ package -@java.lang.annotation.Target(value = {ElementType.PACKAGE}) @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.annotation() public final class my : kotlin.Annotation { +@java.lang.annotation.Target(value = {ElementType.PACKAGE}) @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class my : kotlin.Annotation { public constructor my() 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 } -@java.lang.annotation.Retention(value = RetentionPolicy.SOURCE) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.annotation() public final class your : kotlin.Annotation { +@java.lang.annotation.Retention(value = RetentionPolicy.SOURCE) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class your : kotlin.Annotation { public constructor your() 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/tests/annotations/options/javaretention.txt b/compiler/testData/diagnostics/tests/annotations/options/javaretention.txt index a715dd048c3..f69e612ba46 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/javaretention.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/javaretention.txt @@ -6,28 +6,28 @@ public open class AnnotationRetentions { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public final class BaseAnnotation : kotlin.Annotation { + public final annotation class BaseAnnotation : kotlin.Annotation { public constructor BaseAnnotation() 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 } - @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final class BinaryAnnotation : kotlin.Annotation { + @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class BinaryAnnotation : kotlin.Annotation { public constructor BinaryAnnotation() 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 } - @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final class RuntimeAnnotation : kotlin.Annotation { + @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class RuntimeAnnotation : kotlin.Annotation { public constructor RuntimeAnnotation() 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 } - @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final class SourceAnnotation : kotlin.Annotation { + @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final annotation class SourceAnnotation : kotlin.Annotation { public constructor SourceAnnotation() 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/tests/annotations/options/multiDeclaration.txt b/compiler/testData/diagnostics/tests/annotations/options/multiDeclaration.txt index 5a72042184c..5be8a82f139 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/multiDeclaration.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/multiDeclaration.txt @@ -2,7 +2,7 @@ package public fun foo(): kotlin.Int -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.annotation() public final class My : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class My : kotlin.Annotation { public constructor My() 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/tests/annotations/options/objectLiteral.txt b/compiler/testData/diagnostics/tests/annotations/options/objectLiteral.txt index b91bd97bb46..56c9b98ff29 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/objectLiteral.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/objectLiteral.txt @@ -2,7 +2,7 @@ package public fun foo(): My -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/annotations/options/prefix.txt b/compiler/testData/diagnostics/tests/annotations/options/prefix.txt index 61f00b2a86b..e3a7f0b8b29 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/prefix.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/prefix.txt @@ -2,14 +2,14 @@ package public fun foo(): kotlin.Int -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.annotation() public final class ExprAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class ExprAnn : kotlin.Annotation { public constructor ExprAnn() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) @kotlin.annotation.annotation() public final class FunAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) public final annotation class FunAnn : kotlin.Annotation { public constructor FunAnn() 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/tests/annotations/options/repeatable.txt b/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt index 21772a70931..e77af898baf 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt @@ -30,21 +30,21 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class binrepann : kotlin.Annotation { +@kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.Repeatable() public final annotation class binrepann : kotlin.Annotation { public constructor binrepann() 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 } -@kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class repann : kotlin.Annotation { +@kotlin.annotation.Repeatable() public final annotation class repann : kotlin.Annotation { public constructor repann() 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 } -@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class repann1 : kotlin.Annotation { +@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class repann1 : kotlin.Annotation { public constructor repann1(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -52,7 +52,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class repann2 : kotlin.Annotation { +@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class repann2 : kotlin.Annotation { public constructor repann2(/*0*/ f: kotlin.Boolean) public final val f: kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -60,7 +60,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class repexpr : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Repeatable() public final annotation class repexpr : kotlin.Annotation { public constructor repexpr() 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/tests/annotations/options/retention.txt b/compiler/testData/diagnostics/tests/annotations/options/retention.txt index df5868fbafc..55c6561fb03 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/retention.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/retention.txt @@ -7,7 +7,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.annotation() public final class sourceann : kotlin.Annotation { +@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final annotation class sourceann : kotlin.Annotation { public constructor sourceann() 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/tests/annotations/options/setterParam.txt b/compiler/testData/diagnostics/tests/annotations/options/setterParam.txt index 4d354900049..f709e8f8a98 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/setterParam.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/setterParam.txt @@ -2,7 +2,7 @@ package public var x: kotlin.Int -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/annotations/options/target.txt b/compiler/testData/diagnostics/tests/annotations/options/target.txt index ed73b7f82a0..088428331e8 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/target.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/target.txt @@ -10,7 +10,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class base : kotlin.Annotation { public constructor base() 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/tests/annotations/options/targets/accessors.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt index ed639436c2e..d37b8692fd4 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt @@ -9,21 +9,21 @@ public final class My { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) public final annotation class base : kotlin.Annotation { public constructor base() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.annotation() public final class smartget : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) public final annotation class smartget : kotlin.Annotation { public constructor smartget() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) @kotlin.annotation.annotation() public final class smartset : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) public final annotation class smartset : kotlin.Annotation { public constructor smartset() 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/tests/annotations/options/targets/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt index d115fa8df83..f462484afda 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt @@ -23,7 +23,7 @@ package @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final annotation class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -39,7 +39,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@base() @kotlin.annotation.annotation() public final class derived : kotlin.Annotation { +@base() public final annotation class derived : kotlin.Annotation { public constructor derived() 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/tests/annotations/options/targets/classifier.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt index f67794f5904..65b0a4e103c 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt @@ -23,7 +23,7 @@ package @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -39,7 +39,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@base() @kotlin.annotation.annotation() public final class derived : kotlin.Annotation { +@base() public final annotation class derived : kotlin.Annotation { public constructor derived() 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/tests/annotations/options/targets/constructor.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt index 3197110d3ae..783cb1867b7 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt @@ -23,7 +23,7 @@ package @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) public final annotation class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -39,7 +39,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@base() @kotlin.annotation.annotation() public final class derived : kotlin.Annotation { +@base() public final annotation class derived : kotlin.Annotation { public constructor derived() 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/tests/annotations/options/targets/empty.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt index a514c87f1d0..85eeee02005 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt @@ -32,14 +32,14 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@empty() @kotlin.annotation.annotation() public final class derived : kotlin.Annotation { +@empty() public final annotation class derived : kotlin.Annotation { public constructor derived() 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 } -@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.annotation() public final class empty : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {}) public final annotation class empty : kotlin.Annotation { public constructor empty() 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/tests/annotations/options/targets/expr.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt index 2ba45500702..56370cbf4da 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt @@ -3,14 +3,14 @@ package @base() @special() public fun foo(/*0*/ i: kotlin.Int): kotlin.Int public fun transform(/*0*/ i: kotlin.Int, /*1*/ tr: (kotlin.Int) -> kotlin.Int): kotlin.Int -@kotlin.annotation.annotation() public final class base : kotlin.Annotation { +public final annotation class base : kotlin.Annotation { public constructor base() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.annotation() public final class special : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class special : kotlin.Annotation { public constructor special() 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/tests/annotations/options/targets/file.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt index 3d1fe72ac70..9c2f09d4e63 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt @@ -16,14 +16,14 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class common : kotlin.Annotation { + public final annotation class common : kotlin.Annotation { public constructor common() 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 } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE}) @kotlin.annotation.annotation() public final class special : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE}) public final annotation class special : kotlin.Annotation { public constructor special() 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/tests/annotations/options/targets/function.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt index 91dad1289aa..003e18ee890 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt @@ -23,7 +23,7 @@ package @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) public final annotation class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -40,7 +40,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@base() @kotlin.annotation.annotation() public final class derived : kotlin.Annotation { +@base() public final annotation class derived : kotlin.Annotation { public constructor derived() 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/tests/annotations/options/targets/funtypeargs.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.txt index c88cfc375a8..b13607a4888 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.txt @@ -3,14 +3,14 @@ package public fun foo(/*0*/ i: kotlin.Int): kotlin.Int public fun transform(/*0*/ i: kotlin.Int, /*1*/ tr: (kotlin.Int) -> kotlin.Int): kotlin.Int -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class base : kotlin.Annotation { public constructor base() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.annotation() public final class special : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class special : kotlin.Annotation { public constructor special() 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/tests/annotations/options/targets/incorrect.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt index 2c5b84b2cd4..f706a77935e 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt @@ -32,14 +32,14 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@incorrect() @kotlin.annotation.annotation() public final class derived : kotlin.Annotation { +@incorrect() public final annotation class derived : kotlin.Annotation { public constructor derived() 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 } -@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.annotation() public final class incorrect : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {}) public final annotation class incorrect : kotlin.Annotation { public constructor incorrect() 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/tests/annotations/options/targets/init.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/init.txt index 50ca98b9da1..50f0962821e 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/init.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/init.txt @@ -7,7 +7,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class base : kotlin.Annotation { +public final annotation class base : kotlin.Annotation { public constructor base() 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/tests/annotations/options/targets/java.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt index 43a33ec5690..f5209c86af7 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt @@ -8,63 +8,63 @@ package test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public final class base : kotlin.Annotation { + public final annotation class base : kotlin.Annotation { public constructor base() 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 } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD}) public final class fieldann : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD}) public final annotation class fieldann : kotlin.Annotation { public constructor fieldann() 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 } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) public final class konstructor : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) public final annotation class konstructor : kotlin.Annotation { public constructor konstructor() 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 } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) public final class local : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) public final annotation class local : kotlin.Annotation { public constructor local() 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 } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final class meta : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final annotation class meta : kotlin.Annotation { public constructor meta() 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 } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) public final class method : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) public final annotation class method : kotlin.Annotation { public constructor method() 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 } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD}) public final class multiple : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD}) public final annotation class multiple : kotlin.Annotation { public constructor multiple() 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 } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final class parameter : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final annotation class parameter : kotlin.Annotation { public constructor parameter() 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 } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FILE}) public final class type : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FILE}) public final annotation class type : kotlin.Annotation { public constructor type() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -83,7 +83,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @test.AnnotationTargets.base() @test.AnnotationTargets.meta() @test.AnnotationTargets.type() @test.AnnotationTargets.konstructor() @kotlin.annotation.annotation() public final class KMeta : kotlin.Annotation { + @test.AnnotationTargets.base() @test.AnnotationTargets.meta() @test.AnnotationTargets.type() @test.AnnotationTargets.konstructor() public final annotation class KMeta : kotlin.Annotation { public constructor KMeta() 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/tests/annotations/options/targets/local.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt index 6e9c199c399..0f4816eed3f 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt @@ -23,7 +23,7 @@ package @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) public final annotation class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -39,7 +39,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@base() @kotlin.annotation.annotation() public final class derived : kotlin.Annotation { +@base() public final annotation class derived : kotlin.Annotation { public constructor derived() 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/tests/annotations/options/targets/nested.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt index 9db9784b6d0..99338097ec0 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt @@ -7,7 +7,7 @@ package public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - @base() @meta() @kotlin.annotation.annotation() public final class Annotated : kotlin.Annotation { + @base() @meta() public final annotation class Annotated : kotlin.Annotation { public constructor Annotated() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -22,14 +22,14 @@ package } } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class base : kotlin.Annotation { public constructor base() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) @kotlin.annotation.annotation() public final class meta : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final annotation class meta : kotlin.Annotation { public constructor meta() 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/tests/annotations/options/targets/property.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt index 675efb0c9be..b592cf3cad1 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt @@ -23,7 +23,7 @@ package @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY}) public final annotation class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -39,7 +39,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@base() @kotlin.annotation.annotation() public final class derived : kotlin.Annotation { +@base() public final annotation class derived : kotlin.Annotation { public constructor derived() 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/tests/annotations/options/targets/returntype.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt index f2c3ca251ef..e4cc57bcda1 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt @@ -10,14 +10,14 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class base : kotlin.Annotation { +public final annotation class base : kotlin.Annotation { public constructor base() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class typed : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class typed : kotlin.Annotation { public constructor typed() 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/tests/annotations/options/targets/type.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt index 64f4ecebef6..37c60e6842a 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt @@ -23,7 +23,7 @@ package @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -39,7 +39,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@base() @kotlin.annotation.annotation() public final class derived : kotlin.Annotation { +@base() public final annotation class derived : kotlin.Annotation { public constructor derived() 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/tests/annotations/options/targets/typeParams.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/typeParams.txt index 0302134adf0..a88825b9315 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/typeParams.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/typeParams.txt @@ -7,14 +7,14 @@ public fun test(/*0*/ t: @A() T): T public fun test2(/*0*/ t: T): T public fun topFun(): kotlin.Int -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.annotation() public final class A : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) public final annotation class A : kotlin.Annotation { public constructor A() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.annotation() public final class B : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) public final annotation class B : kotlin.Annotation { public constructor B(/*0*/ i: kotlin.Int = ...) public final val i: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -22,7 +22,7 @@ public fun topFun(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() internal final class C : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) internal final annotation class C : kotlin.Annotation { public constructor C() 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/tests/annotations/options/targets/typeargs.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt index 314c1130ba0..9c0e5aed368 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt @@ -4,14 +4,14 @@ public val x: kotlin.List<@base() kotlin.String>? = null public val y: kotlin.List<@base() kotlin.String>? = null public fun foo(/*0*/ list: kotlin.List<@typeAnn() kotlin.Int>): kotlin.List<@typeAnn() kotlin.Int> -@kotlin.annotation.annotation() public final class base : kotlin.Annotation { +public final annotation class base : kotlin.Annotation { public constructor base() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class typeAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class typeAnn : kotlin.Annotation { public constructor typeAnn() 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/tests/annotations/options/targets/valueparam.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt index b7336926a8d..9140f9ad6c4 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt @@ -23,7 +23,7 @@ package @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) @kotlin.annotation.annotation() public final class base : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final annotation class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -39,7 +39,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@base() @kotlin.annotation.annotation() public final class derived : kotlin.Annotation { +@base() public final annotation class derived : kotlin.Annotation { public constructor derived() 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/tests/annotations/options/unrepeatable.txt b/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt index 8609f753fed..0e90958fe26 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt @@ -16,7 +16,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann(/*0*/ y: kotlin.Int) public final val y: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -24,14 +24,14 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.annotation() public final class annexpr : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class annexpr : kotlin.Annotation { public constructor annexpr() 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 } -@kotlin.annotation.annotation() public final class unrepann : kotlin.Annotation { +public final annotation class unrepann : kotlin.Annotation { public constructor unrepann(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt index 52569f6d4d6..b35bf1cb7b5 100644 --- a/compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt +++ b/compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt @@ -12,7 +12,7 @@ public final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class x : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class x : kotlin.Annotation { public constructor x() 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/tests/annotations/withUseSiteTarget/FieldAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.txt index deade42cfcd..778e76c9ac7 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.txt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/annotations/withUseSiteTarget/FileAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FileAnnotations.txt index b243db16bca..375a0f87e66 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FileAnnotations.txt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FileAnnotations.txt @@ -1,13 +1,13 @@ package -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.annotation() public final class ClassAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class ClassAnn : kotlin.Annotation { public constructor ClassAnn() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE}) @kotlin.annotation.annotation() public final class FileAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE}) public final annotation class FileAnn : kotlin.Annotation { public constructor FileAnn() 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/tests/annotations/withUseSiteTarget/GetterAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt index 0802bdf9d2f..a5281afd33c 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/annotations/withUseSiteTarget/ParamAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ParamAnnotations.txt index 889b2365959..031919de27b 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ParamAnnotations.txt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ParamAnnotations.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -15,7 +15,7 @@ public final class PrimaryConstructorClass { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Second : kotlin.Annotation { +public final annotation class Second : kotlin.Annotation { public constructor Second() 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/tests/annotations/withUseSiteTarget/PropertyAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.txt index 802e3f3e660..8eba94d4378 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.txt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -15,7 +15,7 @@ public final class CustomDelegate { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Second : kotlin.Annotation { +public final annotation class Second : kotlin.Annotation { public constructor Second() 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/tests/annotations/withUseSiteTarget/ReceiverAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.txt index 726e0e5fe39..e7c9d4658de 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.txt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.txt @@ -3,7 +3,7 @@ package public val @receiver:Ann() kotlin.String.extensionProperty: kotlin.String public fun @receiver:Ann() kotlin.String.length2(): kotlin.Int -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/annotations/withUseSiteTarget/SetterAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt index b6419f615cf..6b9979906a0 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/annotations/withUseSiteTarget/SparamAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.txt index bbba899ce5d..f63e0a1008b 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.txt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/annotations/withUseSiteTarget/repeatable.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt index aa86b1a6e31..71830de16b2 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt @@ -13,14 +13,14 @@ public final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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 } -@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class RepeatableAnn : kotlin.Annotation { +@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class RepeatableAnn : kotlin.Annotation { public constructor RepeatableAnn() 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/tests/callableReference/function/abstractClassConstructors.txt b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt index 5ea1d72c77f..3133c96f0b8 100644 --- a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt +++ b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt @@ -15,7 +15,7 @@ public abstract class B { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class C : kotlin.Annotation { +public final annotation class C : kotlin.Annotation { public constructor C() 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/tests/dataClasses/strange.txt b/compiler/testData/diagnostics/tests/dataClasses/strange.txt index ebb7a28c1c8..6f6abe32dff 100644 --- a/compiler/testData/diagnostics/tests/dataClasses/strange.txt +++ b/compiler/testData/diagnostics/tests/dataClasses/strange.txt @@ -23,7 +23,7 @@ public final data enum class First : kotlin.Enum { @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.annotation() public final data class Fourth : kotlin.Annotation { +public final data annotation class Fourth : kotlin.Annotation { public constructor Fourth(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public final operator /*synthesized*/ fun component1(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt b/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt index 6cbb6d2c60a..50de6fa4ab0 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt +++ b/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt @@ -29,7 +29,7 @@ public final class Outer { public final fun B.(): kotlin.Unit } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.FUNCTION}) @kotlin.annotation.annotation() public final class a : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.FUNCTION}) public final annotation class a : kotlin.Annotation { public constructor a() 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/tests/declarationChecks/illegalModifiersOnClass.txt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt index 0fc47fe918a..4269e6ebe63 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt +++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt @@ -85,7 +85,7 @@ public interface D { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public open class E : kotlin.Annotation { +public open annotation class E : kotlin.Annotation { public constructor E() 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/tests/deparenthesize/annotatedSafeCall.txt b/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.txt index 3b8cdd29a31..dcc675b56d4 100644 --- a/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.txt +++ b/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.txt @@ -2,7 +2,7 @@ package public fun f(/*0*/ s: kotlin.String?): kotlin.Boolean -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.annotation() public final class foo : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class foo : kotlin.Annotation { public constructor foo() 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/tests/deprecated/annotationUsage.txt b/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt index e31d253421d..d8af81f365d 100644 --- a/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt +++ b/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt @@ -14,14 +14,14 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.Deprecated(message = "text") @kotlin.annotation.annotation() public final class obsolete : kotlin.Annotation { +@kotlin.Deprecated(message = "text") public final annotation class obsolete : kotlin.Annotation { public constructor obsolete() 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 } -@kotlin.Deprecated(message = "text") @kotlin.annotation.annotation() public final class obsoleteWithParam : kotlin.Annotation { +@kotlin.Deprecated(message = "text") public final annotation class obsoleteWithParam : kotlin.Annotation { public constructor obsoleteWithParam(/*0*/ text: kotlin.String) public final val text: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt index 0013e7926bd..621c6f70990 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt @@ -34,7 +34,7 @@ public final enum class : kotlin.Enum<> { @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<> } -@kotlin.annotation.annotation() public final class : kotlin.Annotation { +public final annotation class : kotlin.Annotation { public constructor () public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -85,7 +85,7 @@ public final class Outer { @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array> } - @kotlin.annotation.annotation() public final class : kotlin.Annotation { + public final annotation class : kotlin.Annotation { public constructor () 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/tests/enum/enumWithAnnotationKeyword.txt b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt index c80a66ef732..943a4d8eae3 100644 --- a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt +++ b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final enum class E : kotlin.Enum { +public final enum class E : kotlin.Enum { enum entry D private constructor E() diff --git a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt index 1cc262fa7e2..d708275edb9 100644 --- a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt @@ -21,7 +21,7 @@ public final enum class E : kotlin.Enum { enum entry INNER - @kotlin.annotation.annotation() enum entry ANNOTATION + enum entry ANNOTATION enum entry ENUM diff --git a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt index 5f187fa353c..ec3df72eced 100644 --- a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt +++ b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt @@ -12,7 +12,7 @@ public val a9: kotlin.Int public val b1: kotlin.Byte @Ann() public val b2: kotlin.Int = 1 -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ i: kotlin.Int) public final val i: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/Common.txt b/compiler/testData/diagnostics/tests/functionAsExpression/Common.txt index dd583e68284..702e3c70a49 100644 --- a/compiler/testData/diagnostics/tests/functionAsExpression/Common.txt +++ b/compiler/testData/diagnostics/tests/functionAsExpression/Common.txt @@ -18,7 +18,7 @@ public final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann(/*0*/ name: kotlin.String) public final val name: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/WithoutBody.txt b/compiler/testData/diagnostics/tests/functionAsExpression/WithoutBody.txt index 5a152430a47..8192b3d5358 100644 --- a/compiler/testData/diagnostics/tests/functionAsExpression/WithoutBody.txt +++ b/compiler/testData/diagnostics/tests/functionAsExpression/WithoutBody.txt @@ -4,7 +4,7 @@ public val bas: () -> kotlin.Unit public fun bar(/*0*/ a: kotlin.Any): () -> kotlin.Unit public fun outer(): kotlin.Unit -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann() 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/tests/inner/classesInClassObjectHeader.txt b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt index 3ca7e9718dd..3bd9c43cfdd 100644 --- a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt +++ b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt @@ -13,7 +13,7 @@ public final class Test { public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class InnerAnnotation : kotlin.Annotation { + public final annotation class InnerAnnotation : kotlin.Annotation { public constructor InnerAnnotation() 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/tests/inner/illegalModifier.txt b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt index a684ff40d57..b604dc645e4 100644 --- a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt +++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt @@ -73,7 +73,7 @@ public final class D { @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } - @kotlin.annotation.annotation() public final class S : kotlin.Annotation { + public final annotation class S : kotlin.Annotation { public constructor S() 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/tests/inner/selfAnnotationForClassObject.txt b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt index edfff206d7e..df68c4f4140 100644 --- a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt +++ b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt @@ -12,7 +12,7 @@ public final class Test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - @kotlin.annotation.annotation() public final class ClassObjectAnnotation : kotlin.Annotation { + public final annotation class ClassObjectAnnotation : kotlin.Annotation { public constructor ClassObjectAnnotation() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -20,7 +20,7 @@ public final class Test { } } - @kotlin.annotation.annotation() public final class NestedAnnotation : kotlin.Annotation { + public final annotation class NestedAnnotation : kotlin.Annotation { public constructor NestedAnnotation() 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/tests/modifiers/IllegalModifiers.txt b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt index e08a73b7897..103c0a4fbd8 100644 --- a/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt +++ b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt @@ -45,7 +45,7 @@ package illegal_modifiers { } public final class IllegalModifiers10 { - @kotlin.annotation.annotation() public constructor IllegalModifiers10() + public constructor IllegalModifiers10() 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 @@ -100,15 +100,15 @@ package illegal_modifiers { public open class IllegalModifiers7 { public constructor IllegalModifiers7() - @kotlin.annotation.annotation() public final val x: kotlin.Int = 1 + public final val x: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @kotlin.annotation.annotation() public final fun foo(): kotlin.Unit + public final fun foo(): 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 IllegalModifiers8 { - @kotlin.annotation.annotation() public constructor IllegalModifiers8() + public constructor IllegalModifiers8() public constructor IllegalModifiers8(/*0*/ 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 @@ -138,7 +138,7 @@ package illegal_modifiers { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class annotated : kotlin.Annotation { + public final annotation class annotated : kotlin.Annotation { public constructor annotated(/*0*/ text: kotlin.String = ...) public final val text: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/modifiers/annotations.txt b/compiler/testData/diagnostics/tests/modifiers/annotations.txt index ff98b4aaa6a..394e4f00029 100644 --- a/compiler/testData/diagnostics/tests/modifiers/annotations.txt +++ b/compiler/testData/diagnostics/tests/modifiers/annotations.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class His : Your { +public final annotation class His : Your { public constructor His(/*0*/ x: kotlin.Int) public open override /*1*/ val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -8,7 +8,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class My : kotlin.Annotation { +public final annotation class My : kotlin.Annotation { public constructor My(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int, /*2*/ z: kotlin.Int, /*3*/ w: kotlin.Int) private final val w: kotlin.Int public final val x: kotlin.Int diff --git a/compiler/testData/diagnostics/tests/modifiers/const/fromJava.txt b/compiler/testData/diagnostics/tests/modifiers/const/fromJava.txt index 30f97aed659..64c9a82ba96 100644 --- a/compiler/testData/diagnostics/tests/modifiers/const/fromJava.txt +++ b/compiler/testData/diagnostics/tests/modifiers/const/fromJava.txt @@ -17,7 +17,7 @@ public open class A { public const final val Y: kotlin.Int } -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/modifiers/primaryConstructorMissingKeyword.txt b/compiler/testData/diagnostics/tests/modifiers/primaryConstructorMissingKeyword.txt index f93c11f437a..ca110957cd1 100644 --- a/compiler/testData/diagnostics/tests/modifiers/primaryConstructorMissingKeyword.txt +++ b/compiler/testData/diagnostics/tests/modifiers/primaryConstructorMissingKeyword.txt @@ -17,7 +17,7 @@ public final class A { } } -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ x: kotlin.Int = ...) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/modifiers/protected.txt b/compiler/testData/diagnostics/tests/modifiers/protected.txt index 61808b6a6e1..6d2371af76e 100644 --- a/compiler/testData/diagnostics/tests/modifiers/protected.txt +++ b/compiler/testData/diagnostics/tests/modifiers/protected.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class His : kotlin.Annotation { +public final annotation class His : kotlin.Annotation { public constructor His(/*0*/ x: kotlin.Int) protected final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt b/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt index f29327238ff..e5e2cd3147d 100644 --- a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt +++ b/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt @@ -2,7 +2,7 @@ package @A(x = 1, y = "2") public fun test(): kotlin.Unit -public final class A : kotlin.Annotation { +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 diff --git a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt index 5ba93dc7c20..2baab918742 100644 --- a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt +++ b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt @@ -32,7 +32,7 @@ public final enum class : kotlin.Enum<> { @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<> } -@kotlin.annotation.annotation() public final class : kotlin.Annotation { +public final annotation class : kotlin.Annotation { public constructor () 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/tests/resolve/resolveAnnotatedLambdaArgument.txt b/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt index a44ca174212..3faf2ed057e 100644 --- a/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt +++ b/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt @@ -3,7 +3,7 @@ package public fun bar(/*0*/ block: (T) -> kotlin.Int): kotlin.Unit public fun foo(): kotlin.Unit -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation { public constructor Ann() 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/tests/secondaryConstructors/ctrsAnnotationResolve.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.txt index 451586c935b..663d5c166a9 100644 --- a/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.txt +++ b/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.txt @@ -9,14 +9,14 @@ public final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann1 : kotlin.Annotation { +public final annotation class Ann1 : kotlin.Annotation { public constructor Ann1() 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 } -@kotlin.annotation.annotation() public final class Ann2 : kotlin.Annotation { +public final annotation class Ann2 : kotlin.Annotation { public constructor Ann2(/*0*/ x: kotlin.Int) public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/smartCasts/lambdaCallAnnotated.txt b/compiler/testData/diagnostics/tests/smartCasts/lambdaCallAnnotated.txt index 77e23fb17c2..c71ad6cd9bf 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/lambdaCallAnnotated.txt +++ b/compiler/testData/diagnostics/tests/smartCasts/lambdaCallAnnotated.txt @@ -2,7 +2,7 @@ package public fun bar(): kotlin.Int -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) @kotlin.annotation.annotation() public final class My : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class My : kotlin.Annotation { public constructor My() 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/tests/when/AnnotatedWhenStatement.txt b/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.txt index 58e3c4d010d..63d4385ff35 100644 --- a/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.txt +++ b/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.txt @@ -2,7 +2,7 @@ package public fun foo(/*0*/ a: kotlin.Int): kotlin.Unit -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann() 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/testsWithJava8/annotations/deprecatedRepeatable.txt b/compiler/testData/diagnostics/testsWithJava8/annotations/deprecatedRepeatable.txt index 6effb4c7295..62ada953559 100644 --- a/compiler/testData/diagnostics/testsWithJava8/annotations/deprecatedRepeatable.txt +++ b/compiler/testData/diagnostics/testsWithJava8/annotations/deprecatedRepeatable.txt @@ -1,6 +1,6 @@ package -@kotlin.annotation.annotation() public final class Annotations : kotlin.Annotation { +public final annotation class Annotations : kotlin.Annotation { public constructor Annotations(/*0*/ vararg value: RepAnn /*kotlin.Array*/) public final val value: kotlin.Array public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -8,14 +8,14 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@java.lang.annotation.Repeatable(value = OtherAnnotations::class) @kotlin.annotation.annotation() public final class OtherAnn : kotlin.Annotation { +@java.lang.annotation.Repeatable(value = OtherAnnotations::class) public final annotation class OtherAnn : kotlin.Annotation { public constructor OtherAnn() 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 } -@kotlin.annotation.annotation() public final class OtherAnnotations : kotlin.Annotation { +public final annotation class OtherAnnotations : kotlin.Annotation { public constructor OtherAnnotations(/*0*/ vararg value: OtherAnn /*kotlin.Array*/) public final val value: kotlin.Array public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -23,7 +23,7 @@ package public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@java.lang.annotation.Repeatable(value = Annotations::class) @kotlin.annotation.annotation() public final class RepAnn : kotlin.Annotation { +@java.lang.annotation.Repeatable(value = Annotations::class) public final annotation class RepAnn : kotlin.Annotation { public constructor RepAnn() 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/ClassObjectAnnotatedWithItsKClass.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.txt index 744314ecd54..316f89ef6fc 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.txt @@ -2,7 +2,7 @@ package package test { - @kotlin.annotation.annotation() public final class AnnClass : kotlin.Annotation { + public final annotation class AnnClass : kotlin.Annotation { public constructor AnnClass(/*0*/ a: kotlin.reflect.KClass<*>) public final val a: 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/annotationApplicability/multifileClassPart.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/multifileClassPart.txt index d75e22b8133..d596d11f8b2 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/multifileClassPart.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/multifileClassPart.txt @@ -1,20 +1,20 @@ package -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.annotation() public final class FileAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class FileAnn : kotlin.Annotation { public constructor FileAnn() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.annotation() public final class FileBinaryAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class FileBinaryAnn : kotlin.Annotation { public constructor FileBinaryAnn() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.annotation() public final class FileSourceAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final annotation class FileSourceAnn : kotlin.Annotation { public constructor FileSourceAnn() 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/annotationApplicability/multifileClassPartWithJavaAnnotation.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/multifileClassPartWithJavaAnnotation.txt index 1cf02d796f5..d4be8f92601 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/multifileClassPartWithJavaAnnotation.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/multifileClassPartWithJavaAnnotation.txt @@ -1,20 +1,20 @@ package -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final class JavaAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class JavaAnn : kotlin.Annotation { public constructor JavaAnn() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final class JavaClassAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class JavaClassAnn : kotlin.Annotation { public constructor JavaClassAnn() 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 } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final class JavaSourceAnn : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final annotation class JavaSourceAnn : kotlin.Annotation { public constructor JavaSourceAnn() 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/annotationParameterMustBeConstant/array.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt index 3527139b05d..c3c39dbd6d0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt @@ -6,7 +6,7 @@ public val i3: kotlin.Int public val iAnn: Ann public fun foo(): kotlin.Int -@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ i: kotlin.IntArray) public final val i: kotlin.IntArray public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -14,7 +14,7 @@ public fun foo(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class AnnAnn : kotlin.Annotation { +@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class AnnAnn : kotlin.Annotation { public constructor AnnAnn(/*0*/ i: kotlin.Array) public final val i: kotlin.Array public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt index 1bd4d48507b..ad50dbf164d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt @@ -6,7 +6,7 @@ public val ia: kotlin.IntArray public val sa: kotlin.Array public fun foo(): kotlin.Int -@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ i: kotlin.Int) public final val i: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -14,14 +14,14 @@ public fun foo(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann2 : kotlin.Annotation { +public final annotation class Ann2 : kotlin.Annotation { public constructor Ann2() 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 } -@kotlin.annotation.annotation() public final class AnnIA : kotlin.Annotation { +public final annotation class AnnIA : kotlin.Annotation { public constructor AnnIA(/*0*/ ia: kotlin.IntArray) public final val ia: kotlin.IntArray public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -29,7 +29,7 @@ public fun foo(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class AnnSA : kotlin.Annotation { +public final annotation class AnnSA : kotlin.Annotation { public constructor AnnSA(/*0*/ sa: kotlin.Array) public final val sa: kotlin.Array public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/useOfNonConstVal.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/useOfNonConstVal.txt index 82ee8aadf45..21810d46e03 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/useOfNonConstVal.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/useOfNonConstVal.txt @@ -6,7 +6,7 @@ public val nonConst: kotlin.Int = 1 @Ann(x = 4, y = "3") public fun foo2(): kotlin.Unit @ArrayAnn(x = {1, 3, 1}) public fun foo3(): kotlin.Unit -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String) public final val x: kotlin.Int public final val y: kotlin.String @@ -15,7 +15,7 @@ public val nonConst: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class ArrayAnn : kotlin.Annotation { +public final annotation class ArrayAnn : kotlin.Annotation { public constructor ArrayAnn(/*0*/ x: kotlin.IntArray) public final val x: kotlin.IntArray public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt index 7289cae4321..29c02f78052 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt @@ -6,7 +6,7 @@ public val i3: kotlin.Int public val iAnn: Ann public fun foo(): kotlin.Int -@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ vararg i: kotlin.Int /*kotlin.IntArray*/) public final val i: kotlin.IntArray public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -14,7 +14,7 @@ public fun foo(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() @kotlin.annotation.annotation() public final class AnnAnn : kotlin.Annotation { +@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Repeatable() public final annotation class AnnAnn : kotlin.Annotation { public constructor AnnAnn(/*0*/ vararg i: Ann /*kotlin.Array*/) public final val i: kotlin.Array public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt index bdf238c14e7..90557dac13d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt index 8162553c26d..ce7731b24ac 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt index c3f133fc4e4..ba59731a58e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt @@ -9,7 +9,7 @@ package @A(value = {}, y = 7) public fun test7(): kotlin.Unit @A(value = {"8", "9", "10"}) public fun test8(): kotlin.Unit -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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<*> diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt index 45fc479dc72..edfeee37f9b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt @@ -12,7 +12,7 @@ package @A(value = {}) public fun test8(): kotlin.Unit @A(value = {}, x = kotlin.Any::class, y = 3) public fun test9(): kotlin.Unit -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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<*> diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt index 53b02d6624f..40c3934de4f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt @@ -6,7 +6,7 @@ package @A(value = {}) public fun test4(): kotlin.Unit @A(value = {}) public fun test5(): kotlin.Unit -public final class A : kotlin.Annotation { +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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt index efd960ae8ba..7a53b037ca7 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt @@ -6,7 +6,7 @@ package @A() public fun test4(): kotlin.Unit @A() public fun test5(): kotlin.Unit -public final class A : kotlin.Annotation { +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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt index 2668addc4f2..fca370b9dd0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt @@ -2,7 +2,7 @@ package @A(value = {1, "b"}) public fun test(): kotlin.Unit -public final class A : kotlin.Annotation { +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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.txt index 08fe1abceed..64736addae6 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.txt @@ -2,7 +2,7 @@ package @B(args = {1, "b"}) public fun test(): kotlin.Unit -@kotlin.annotation.annotation() public final class B : kotlin.Annotation { +public final annotation class B : kotlin.Annotation { public constructor B(/*0*/ vararg args: kotlin.String /*kotlin.Array*/) public final val args: kotlin.Array public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/defaultValueMustBeConstant.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/defaultValueMustBeConstant.txt index eeca8dba849..a8188c4ed7e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/defaultValueMustBeConstant.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/defaultValueMustBeConstant.txt @@ -5,7 +5,7 @@ public val nonConst: kotlin.Int public val nonConstKClass: kotlin.reflect.KClass public fun foo(): kotlin.Int -@kotlin.annotation.annotation() public final class InvalidAnn : kotlin.Annotation { +public final annotation class InvalidAnn : kotlin.Annotation { public constructor InvalidAnn(/*0*/ p1: kotlin.Int = ..., /*1*/ p2: kotlin.Int = ..., /*2*/ p3: kotlin.reflect.KClass<*> = ...) public final val p1: kotlin.Int public final val p2: kotlin.Int @@ -15,7 +15,7 @@ public fun foo(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class ValidAnn : kotlin.Annotation { +public final annotation class ValidAnn : kotlin.Annotation { public constructor ValidAnn(/*0*/ p1: kotlin.Int = ..., /*1*/ p2: kotlin.String = ..., /*2*/ p3: kotlin.reflect.KClass<*> = ..., /*3*/ p4: kotlin.IntArray = ..., /*4*/ p5: kotlin.Array = ..., /*5*/ p6: kotlin.Array> = ...) public final val p1: kotlin.Int public final val p2: kotlin.String diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt index a751fb9601c..2a2ac957553 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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 @@ -10,7 +10,7 @@ public final class A : kotlin.Annotation { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public final class B : kotlin.Annotation { +public final annotation class B : kotlin.Annotation { 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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt index 51827e7fb76..85a6ef7e3ff 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>) public final val arg: 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/argAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt index a077648d781..9fc0cabdc16 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt index 99afc92ef0f..dfb6d794e8b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ arg: kotlin.Array>) public final val arg: kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt index e6c1273acdc..1f297fc241b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ...) public final val arg: 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/argWithDefaultAndOther.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt index 26441d98718..d856a31f3ab 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt index 50118c5fbe7..e595cae8457 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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<*> diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt index 42ad6acc304..c2e2e1ae880 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt index 63a195f6efa..34c32e227f1 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt index dcfc7a3ed1e..15cb385410d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt index 45da90e22e2..0cb49513b5a 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt index 0685cb796a2..1b15d7d8dca 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt @@ -1,6 +1,6 @@ package -public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { 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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.txt index c6b817a9a80..80fecde8f53 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.txt @@ -7,7 +7,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann1 : kotlin.Annotation { +public final annotation class Ann1 : kotlin.Annotation { public constructor Ann1(/*0*/ arg: kotlin.Array>) public final val arg: kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -15,7 +15,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann2 : kotlin.Annotation { +public final annotation class Ann2 : kotlin.Annotation { public constructor Ann2(/*0*/ arg: kotlin.Array>) public final val arg: kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.txt index 791fe2fdf68..ca69686782a 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.txt @@ -7,7 +7,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann1 : kotlin.Annotation { +public final annotation class Ann1 : kotlin.Annotation { public constructor Ann1(/*0*/ arg: kotlin.Array>) public final val arg: kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -15,7 +15,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann2 : kotlin.Annotation { +public final annotation class Ann2 : kotlin.Annotation { public constructor Ann2(/*0*/ arg: kotlin.Array>) public final val arg: kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt index 0ffef520e91..e3ebbb3a743 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt @@ -16,7 +16,7 @@ public final class A2 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann1 : kotlin.Annotation { +public final annotation class Ann1 : kotlin.Annotation { public constructor Ann1(/*0*/ arg: kotlin.reflect.KClass<*>) public final val arg: kotlin.reflect.KClass<*> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -24,7 +24,7 @@ public final class A2 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann2 : kotlin.Annotation { +public final annotation class Ann2 : kotlin.Annotation { public constructor Ann2(/*0*/ vararg arg: kotlin.reflect.KClass<*> /*kotlin.Array>*/) public final val arg: kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -32,7 +32,7 @@ public final class A2 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann3 : kotlin.Annotation { +public final annotation class Ann3 : kotlin.Annotation { public constructor Ann3(/*0*/ arg: kotlin.Array>) public final val arg: kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.txt index 4359fde8b1f..41dbc8f7eaf 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.txt @@ -7,7 +7,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann1 : kotlin.Annotation { +public final annotation class Ann1 : kotlin.Annotation { public constructor Ann1(/*0*/ arg: kotlin.reflect.KClass) public final val arg: kotlin.reflect.KClass public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -15,7 +15,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann2 : kotlin.Annotation { +public final annotation class Ann2 : kotlin.Annotation { public constructor Ann2(/*0*/ arg: kotlin.reflect.KClass) public final val arg: 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/kClass/kClassInAnnotationsOutVariance.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsOutVariance.txt index 940877289c3..9986ae110ea 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsOutVariance.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsOutVariance.txt @@ -7,7 +7,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann1 : kotlin.Annotation { +public final annotation class Ann1 : kotlin.Annotation { public constructor Ann1(/*0*/ arg: kotlin.reflect.KClass) public final val arg: kotlin.reflect.KClass public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -15,7 +15,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann2 : kotlin.Annotation { +public final annotation class Ann2 : kotlin.Annotation { public constructor Ann2(/*0*/ arg: kotlin.reflect.KClass) public final val arg: 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/kClass/kClassInvariantTP.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInvariantTP.txt index b9360e732bc..b800290410b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInvariantTP.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInvariantTP.txt @@ -7,7 +7,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann1 : kotlin.Annotation { +public final annotation class Ann1 : kotlin.Annotation { public constructor Ann1(/*0*/ arg: kotlin.reflect.KClass) public final val arg: kotlin.reflect.KClass public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -15,7 +15,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann2 : kotlin.Annotation { +public final annotation class Ann2 : kotlin.Annotation { public constructor Ann2(/*0*/ arg: kotlin.reflect.KClass) public final val arg: 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/kClass/kClassOutArrayInAnnotationsOutVariance.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassOutArrayInAnnotationsOutVariance.txt index ae3cd6c294e..b26ec046b74 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassOutArrayInAnnotationsOutVariance.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassOutArrayInAnnotationsOutVariance.txt @@ -7,7 +7,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.annotation.annotation() public final class Ann1 : kotlin.Annotation { +public final annotation class Ann1 : kotlin.Annotation { public constructor Ann1(/*0*/ arg: kotlin.Array>) public final val arg: kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/kotlinAnnotation.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/kotlinAnnotation.txt index 5727222684c..2c05595e472 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/kotlinAnnotation.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/kotlinAnnotation.txt @@ -4,7 +4,7 @@ package @Ann(value = "b", x = 2, y = 2.0.toDouble()) public fun foo2(): kotlin.Unit @Ann(value = "c", x = 3, y = 2.0.toDouble()) public fun foo3(): kotlin.Unit -@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ x: kotlin.Int, /*1*/ value: kotlin.String, /*2*/ y: kotlin.Double) public final val value: kotlin.String public final val x: kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt index ed06fa75065..716fba1286a 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt @@ -2,7 +2,7 @@ package @A(a = false, b = 1.0.toDouble(), x = false) public fun foo1(): kotlin.Unit -public final class A : kotlin.Annotation { +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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt index 73b46c3c111..471a49e45c8 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt @@ -3,7 +3,7 @@ package @A(a = false, b = 1.0.toDouble(), x = false) public fun foo1(): kotlin.Unit @A(a = 2.0.toDouble(), b = 2.0.toDouble(), x = true) public fun foo2(): kotlin.Unit -public final class A : kotlin.Annotation { +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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt index 16eda1f6568..54418dd7d08 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt @@ -5,7 +5,7 @@ package @A(a = 4, b = 3.0.toDouble(), value = "v2", x = true) public fun foo3(): kotlin.Unit @A(a = 4, b = 3.0.toDouble(), value = "v2", x = true) public fun foo4(): kotlin.Unit -public final class A : kotlin.Annotation { +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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt index a6af04de796..fedd71ed81f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt @@ -4,7 +4,7 @@ package @A(a = 2, b = 2.0.toDouble(), x = true) public fun foo2(): kotlin.Unit @A(a = 4, b = 3.0.toDouble(), x = true) public fun foo3(): kotlin.Unit -public final class A : kotlin.Annotation { +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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt index 39210b0b5a3..bbcd898883f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt @@ -13,7 +13,7 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - @kotlin.annotation.annotation() public final class IAnn : kotlin.Annotation { + public final annotation class IAnn : kotlin.Annotation { public constructor IAnn() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -21,7 +21,7 @@ package a { } } - @kotlin.annotation.annotation() public final class ann1 : kotlin.Annotation { + public final annotation class ann1 : kotlin.Annotation { public constructor ann1(/*0*/ p: kotlin.Deprecated = ...) public final val p: kotlin.Deprecated public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -29,7 +29,7 @@ package a { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class ann2 : kotlin.Annotation { + public final annotation class ann2 : kotlin.Annotation { public constructor ann2(/*0*/ p: a.b.c.ann1 = ...) public final val p: a.b.c.ann1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -37,7 +37,7 @@ package a { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class ann3 : kotlin.Annotation { + public final annotation class ann3 : kotlin.Annotation { public constructor ann3(/*0*/ p: a.b.c.A.IAnn = ..., /*1*/ p2: a.b.c.A.IAnn = ...) public final val p: a.b.c.A.IAnn public final val p2: a.b.c.A.IAnn @@ -46,7 +46,7 @@ package a { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - @kotlin.annotation.annotation() public final class annArray : kotlin.Annotation { + public final annotation class annArray : kotlin.Annotation { public constructor annArray(/*0*/ p: kotlin.Array = ...) public final val p: kotlin.Array public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt index 2c64eea7819..8759d50a6a7 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt @@ -1,5 +1,5 @@ package test -@test.AnnotatedAnnotation() public final class AnnotatedAnnotation : kotlin.Annotation { +@test.AnnotatedAnnotation() public final annotation class AnnotatedAnnotation : kotlin.Annotation { public constructor AnnotatedAnnotation() } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt index 433ab9a2dfe..12ddc891fb8 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt @@ -3,7 +3,7 @@ package test public open class AnnotatedConstructor { @test.AnnotatedConstructor.Anno(value = "constructor") public constructor AnnotatedConstructor() - public final class Anno : kotlin.Annotation { + public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.String) public final val value: kotlin.String } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt index 35407d45f95..c7af5b681a1 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt @@ -4,7 +4,7 @@ public open class AnnotatedField { public constructor AnnotatedField() @test.AnnotatedField.Anno(value = "member") public final val y: kotlin.Int = 0 - public final class Anno : kotlin.Annotation { + public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.String) public final val value: kotlin.String } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt index f828381c072..973a6572416 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt @@ -4,7 +4,7 @@ public open class AnnotatedMethod { public constructor AnnotatedMethod() @test.AnnotatedMethod.Anno(value = 42) public open fun f(): kotlin.Unit - public final class Anno : kotlin.Annotation { + public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.Int) public final val value: kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt index bd2ad379867..c51425416b0 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt @@ -4,7 +4,7 @@ public open class AnnotatedValueParameter { public constructor AnnotatedValueParameter() public open fun f(/*0*/ @test.AnnotatedValueParameter.Anno(value = "non-empty") p0: kotlin.(Mutable)List!): kotlin.Unit - public final class Anno : kotlin.Annotation { + public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.String) public final val value: kotlin.String } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt index 201f0b864ed..e3fc987f534 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt @@ -14,33 +14,33 @@ public interface AnnotationInParam { public constructor C() } - public final class MyAnnotation : kotlin.Annotation { + public final annotation class MyAnnotation : kotlin.Annotation { public constructor MyAnnotation(/*0*/ value: kotlin.String) public final val value: kotlin.String } - public final class MyAnnotation2 : kotlin.Annotation { + public final annotation class MyAnnotation2 : kotlin.Annotation { public constructor MyAnnotation2(/*0*/ vararg value: kotlin.String /*kotlin.Array*/) public final val value: kotlin.Array } - public final class MyAnnotation3 : kotlin.Annotation { + 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 final class MyAnnotationWithParam : kotlin.Annotation { + public final annotation class MyAnnotationWithParam : kotlin.Annotation { public constructor MyAnnotationWithParam(/*0*/ value: test.AnnotationInParam.MyAnnotation) public final val value: test.AnnotationInParam.MyAnnotation } - public final class MyAnnotationWithParam2 : kotlin.Annotation { + public final annotation class MyAnnotationWithParam2 : kotlin.Annotation { public constructor MyAnnotationWithParam2(/*0*/ value: test.AnnotationInParam.MyAnnotation2) public final val value: test.AnnotationInParam.MyAnnotation2 } - public final class MyAnnotationWithParam3 : kotlin.Annotation { + public final annotation class MyAnnotationWithParam3 : kotlin.Annotation { public constructor MyAnnotationWithParam3(/*0*/ value: test.AnnotationInParam.MyAnnotation3) public final val value: test.AnnotationInParam.MyAnnotation3 } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.txt index 20d481ac8bd..808191ab40d 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.txt @@ -3,7 +3,7 @@ package test public open class AnnotationRetentions { public constructor AnnotationRetentions() - public final class BaseAnnotation : kotlin.Annotation { + public final annotation class BaseAnnotation : kotlin.Annotation { public constructor BaseAnnotation() } @@ -11,7 +11,7 @@ public open class AnnotationRetentions { public/*package*/ constructor BaseClass() } - @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final class BinaryAnnotation : kotlin.Annotation { + @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class BinaryAnnotation : kotlin.Annotation { public constructor BinaryAnnotation() } @@ -19,7 +19,7 @@ public open class AnnotationRetentions { public/*package*/ constructor BinaryClass() } - @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final class RuntimeAnnotation : kotlin.Annotation { + @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class RuntimeAnnotation : kotlin.Annotation { public constructor RuntimeAnnotation() } @@ -27,7 +27,7 @@ public open class AnnotationRetentions { public/*package*/ constructor RuntimeClass() } - @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final class SourceAnnotation : kotlin.Annotation { + @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final annotation class SourceAnnotation : kotlin.Annotation { public constructor SourceAnnotation() } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt index b50c39fde64..cc18019c5a7 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt @@ -3,43 +3,43 @@ package test public open class AnnotationTargets { public constructor AnnotationTargets() - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final class annotation : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final annotation class annotation : kotlin.Annotation { public constructor annotation() } - public final class base : kotlin.Annotation { + public final annotation class base : kotlin.Annotation { public constructor base() } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) public final class constructor : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) public final annotation class constructor : kotlin.Annotation { public constructor constructor() } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD}) public final class field : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD}) public final annotation class field : kotlin.Annotation { public constructor field() } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) public final class local : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) public final annotation class local : kotlin.Annotation { public constructor local() } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) public final class method : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) public final annotation class method : kotlin.Annotation { public constructor method() } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD}) public final class multiple : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD}) public final annotation class multiple : kotlin.Annotation { public constructor multiple() } - @kotlin.annotation.Target(allowedTargets = {}) public final class packag : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {}) public final annotation class packag : kotlin.Annotation { public constructor packag() } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final class parameter : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final annotation class parameter : kotlin.Annotation { public constructor parameter() } - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FILE}) public final class type : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FILE}) public final annotation class type : kotlin.Annotation { public constructor type() } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt index 924c5bed2c8..cf986cc9829 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt @@ -3,7 +3,7 @@ package test public open class ArithmeticExpressionInParam { public constructor ArithmeticExpressionInParam() - public final class Anno : kotlin.Annotation { + public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.Int) public final val value: kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt index 372752d056b..21ec8703aa2 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt @@ -2,7 +2,7 @@ package test public interface ArrayOfEnumInParam { - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD, AnnotationTarget.CONSTRUCTOR}) public final class targetAnnotation : kotlin.Annotation { + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD, AnnotationTarget.CONSTRUCTOR}) public final annotation class targetAnnotation : kotlin.Annotation { public constructor targetAnnotation(/*0*/ value: kotlin.String) public final val value: kotlin.String } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt index 820ccfaf8d6..9ea536f2016 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt @@ -6,7 +6,7 @@ public interface ArrayOfStringInParam { public constructor A() } - public final class MyAnnotation : kotlin.Annotation { + public final annotation class MyAnnotation : kotlin.Annotation { public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array*/) public final val value: kotlin.Array } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt index 7a99ff36016..0de08fbe69c 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt @@ -3,7 +3,7 @@ package test public open class ClassObjectArrayInParam { public constructor ClassObjectArrayInParam() - public final class Anno : kotlin.Annotation { + public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array>*/) public final val value: kotlin.Array> } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt index 54cf47aaf90..4f80c232a1b 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt @@ -3,7 +3,7 @@ package test public open class ClassObjectInParam { public constructor ClassObjectInParam() - public final class Anno : kotlin.Annotation { + public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.reflect.KClass<*>) public final val value: kotlin.reflect.KClass<*> } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt index 55ad93e9c6b..9e8d6f2016b 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt @@ -3,7 +3,7 @@ package test public open class ClassObjectInParamRaw { public constructor ClassObjectInParamRaw() - public final class Anno : kotlin.Annotation { + public final annotation class Anno : kotlin.Annotation { 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<*> diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt index c728d690cf0..9b7a5882a91 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt @@ -3,7 +3,7 @@ package test public open class ClassObjectInParamVariance { public constructor ClassObjectInParamVariance() - public final class Anno : kotlin.Annotation { + public final annotation class Anno : kotlin.Annotation { 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 diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt index b73bf2570bc..8741875176c 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt @@ -2,7 +2,7 @@ package test public interface CustomAnnotation { - public final class MyAnnotation : kotlin.Annotation { + public final annotation class MyAnnotation : kotlin.Annotation { public constructor MyAnnotation(/*0*/ value: test.CustomAnnotation.MyEnum) public final val value: test.CustomAnnotation.MyEnum } diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt index f43afe500c6..6802e51f42d 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt @@ -2,7 +2,7 @@ package test public interface CustomAnnotationWithDefaultParameter { - public final class MyAnnotation : kotlin.Annotation { + 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 diff --git a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt index 2470086a033..1a655bb6220 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt @@ -6,7 +6,7 @@ public interface EmptyArrayInParam { public constructor A() } - public final class MyAnnotation : kotlin.Annotation { + public final annotation class MyAnnotation : kotlin.Annotation { public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array*/) public final val value: kotlin.Array } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt index 35f026542d3..f7341c90c58 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt @@ -19,12 +19,12 @@ public open class EnumArgumentWithCustomToString { @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } - public final class EnumAnno : kotlin.Annotation { + public final annotation class EnumAnno : kotlin.Annotation { public constructor EnumAnno(/*0*/ value: test.EnumArgumentWithCustomToString.E) public final val value: test.EnumArgumentWithCustomToString.E } - public final class EnumArrayAnno : kotlin.Annotation { + public final annotation class EnumArrayAnno : kotlin.Annotation { public constructor EnumArrayAnno(/*0*/ vararg value: test.EnumArgumentWithCustomToString.E /*kotlin.Array*/) public final val value: kotlin.Array } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt index 865340d7871..9e317ff1289 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt @@ -10,7 +10,7 @@ public final enum class EnumConstructorParameter : kotlin.Enum { @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.annotation() public final class EnumOption : kotlin.Annotation { +public final annotation class EnumOption : kotlin.Annotation { /*primary*/ public constructor EnumOption(/*0*/ option: test.E) public final val option: test.E public final fun (): test.E } -@kotlin.annotation.annotation() public final class OptionGroups : kotlin.Annotation { +public final annotation class OptionGroups : kotlin.Annotation { /*primary*/ public constructor OptionGroups(/*0*/ o1: test.StringOptions, /*1*/ o2: test.EnumOption) public final val o1: test.StringOptions public final fun (): test.StringOptions @@ -36,7 +36,7 @@ public final enum class E : kotlin.Enum { public final fun (): test.EnumOption } -@kotlin.annotation.annotation() public final class StringOptions : kotlin.Annotation { +public final annotation class StringOptions : kotlin.Annotation { /*primary*/ public constructor StringOptions(/*0*/ vararg option: kotlin.String /*kotlin.Array*/) public final val option: kotlin.Array public final fun (): kotlin.Array diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt index 1b53c8751c6..e0451bf9dca 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt @@ -18,7 +18,7 @@ public final enum class E : kotlin.Enum { @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.annotation() public final class EnumAnno : kotlin.Annotation { +public final annotation class EnumAnno : kotlin.Annotation { /*primary*/ public constructor EnumAnno(/*0*/ value: test.E) public final val value: test.E public final fun (): test.E @@ -29,7 +29,7 @@ public final class EnumArgumentWithCustomToString { @test.EnumAnno(value = E.CAKE) @test.EnumArrayAnno(value = {E.CAKE, E.CAKE}) public final fun annotated(): kotlin.Unit } -@kotlin.annotation.annotation() public final class EnumArrayAnno : kotlin.Annotation { +public final annotation class EnumArrayAnno : kotlin.Annotation { /*primary*/ public constructor EnumArrayAnno(/*0*/ vararg value: test.E /*kotlin.Array*/) public final val value: kotlin.Array public final fun (): kotlin.Array diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.txt b/compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.txt index f067e97f1b3..f0bb72e79f6 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ s: kotlin.String) public final val s: kotlin.String public final fun (): kotlin.String diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.txt index 87a69c07e09..99a705e74ff 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.annotation() public final class SimpleAnnotation : kotlin.Annotation { +public final annotation class SimpleAnnotation : kotlin.Annotation { /*primary*/ public constructor SimpleAnnotation() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt index ffab67ff27d..27e9895cd19 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.annotation() public final class TargetedAnnotation : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class TargetedAnnotation : kotlin.Annotation { /*primary*/ public constructor TargetedAnnotation() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt index 318775598a3..0ac835afc78 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.txt index 240c15916de..60cd1131d46 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ value: kotlin.String) public final val value: kotlin.String public final fun (): kotlin.String diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt index d7a988f36bb..580c423898b 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt index 74840bb97e5..6bbf764a74c 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType) public final val t: java.lang.annotation.ElementType public final fun (): java.lang.annotation.ElementType diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt index 91e12bc58eb..fa4aeeccf08 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt index f9a2d85afbd..018f255d996 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt index e06f0cd9701..ee18c636f85 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt index 8f43a4dc8bf..cbb9bc0b34a 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt index d062816f7c8..e6877abd572 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt @@ -6,14 +6,14 @@ public final class A { public companion object Companion { /*primary*/ private constructor Companion() - @kotlin.annotation.annotation() public final class Anno1 : kotlin.Annotation { + public final annotation class Anno1 : kotlin.Annotation { /*primary*/ public constructor Anno1() } public final class B { /*primary*/ public constructor B() - @kotlin.annotation.annotation() public final class Anno2 : kotlin.Annotation { + public final annotation class Anno2 : kotlin.Annotation { /*primary*/ public constructor Anno2() } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt index 5902a672460..ec47b99564a 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt index ee551a90cc6..21e9d19d59e 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt index 926431cfddf..39e781122a3 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class `$$$$$$` : kotlin.Annotation { +public final annotation class `$$$$$$` : kotlin.Annotation { /*primary*/ public constructor `$$$$$$`() } @@ -8,7 +8,7 @@ package test /*primary*/ public constructor A() } -@kotlin.annotation.annotation() public final class `Anno$tation` : kotlin.Annotation { +public final annotation class `Anno$tation` : kotlin.Annotation { /*primary*/ public constructor `Anno$tation`() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt index 519e046cb51..dcda9c0af6d 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType) public final val t: java.lang.annotation.ElementType public final fun (): java.lang.annotation.ElementType diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt index 07fba32a37a..7dc9f2840f7 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt @@ -1,14 +1,14 @@ package test -@kotlin.annotation.annotation() public final class A1 : kotlin.Annotation { +public final annotation class A1 : kotlin.Annotation { /*primary*/ public constructor A1() } -@kotlin.annotation.annotation() public final class A2 : kotlin.Annotation { +public final annotation class A2 : kotlin.Annotation { /*primary*/ public constructor A2() } -@kotlin.annotation.annotation() public final class A3 : kotlin.Annotation { +public final annotation class A3 : kotlin.Annotation { /*primary*/ public constructor A3() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt index 025b0ecec00..57e36ecd021 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt @@ -3,7 +3,7 @@ package test public final class A { /*primary*/ public constructor A() - @kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { + public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt index 2852d395011..e429cc38932 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt index 24cf9369fc1..798b64f20b8 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt @@ -1,5 +1,5 @@ package test -@kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +@kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt index c74609de6c2..5f2ac728039 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt index 1c90626c026..2dfa1bbc5c4 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt @@ -1,18 +1,18 @@ package test -@kotlin.annotation.annotation() public final class BooleanAnno : kotlin.Annotation { +public final annotation class BooleanAnno : kotlin.Annotation { /*primary*/ public constructor BooleanAnno(/*0*/ value: kotlin.Boolean) public final val value: kotlin.Boolean public final fun (): kotlin.Boolean } -@kotlin.annotation.annotation() public final class ByteAnno : kotlin.Annotation { +public final annotation class ByteAnno : kotlin.Annotation { /*primary*/ public constructor ByteAnno(/*0*/ value: kotlin.Byte) public final val value: kotlin.Byte public final fun (): kotlin.Byte } -@kotlin.annotation.annotation() public final class CharAnno : kotlin.Annotation { +public final annotation class CharAnno : kotlin.Annotation { /*primary*/ public constructor CharAnno(/*0*/ value: kotlin.Char) public final val value: kotlin.Char public final fun (): kotlin.Char @@ -22,31 +22,31 @@ package test /*primary*/ public constructor Class() } -@kotlin.annotation.annotation() public final class DoubleAnno : kotlin.Annotation { +public final annotation class DoubleAnno : kotlin.Annotation { /*primary*/ public constructor DoubleAnno(/*0*/ value: kotlin.Double) public final val value: kotlin.Double public final fun (): kotlin.Double } -@kotlin.annotation.annotation() public final class FloatAnno : kotlin.Annotation { +public final annotation class FloatAnno : kotlin.Annotation { /*primary*/ public constructor FloatAnno(/*0*/ value: kotlin.Float) public final val value: kotlin.Float public final fun (): kotlin.Float } -@kotlin.annotation.annotation() public final class IntAnno : kotlin.Annotation { +public final annotation class IntAnno : kotlin.Annotation { /*primary*/ public constructor IntAnno(/*0*/ value: kotlin.Int) public final val value: kotlin.Int public final fun (): kotlin.Int } -@kotlin.annotation.annotation() public final class LongAnno : kotlin.Annotation { +public final annotation class LongAnno : kotlin.Annotation { /*primary*/ public constructor LongAnno(/*0*/ value: kotlin.Long) public final val value: kotlin.Long public final fun (): kotlin.Long } -@kotlin.annotation.annotation() public final class ShortAnno : kotlin.Annotation { +public final annotation class ShortAnno : kotlin.Annotation { /*primary*/ public constructor ShortAnno(/*0*/ value: kotlin.Short) public final val value: kotlin.Short public final fun (): kotlin.Short diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt index b3ecca9404c..86386bcf49e 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ int: kotlin.Int, /*1*/ string: kotlin.String, /*2*/ double: kotlin.Double) public final val double: kotlin.Double public final fun (): kotlin.Double diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt index ab3ead115ca..3bed9e83b2f 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt @@ -3,6 +3,6 @@ package test @test.Anno() public val x: kotlin.Int public fun (): kotlin.Int -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt index 9556a71158b..8e1826e2daa 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt @@ -4,7 +4,7 @@ package test public fun (): kotlin.Int @test.Anno(t = ElementType.METHOD) public fun foo(): kotlin.Unit -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType) public final val t: java.lang.annotation.ElementType public final fun (): java.lang.annotation.ElementType diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt index c9ef7ab2718..348bc8db353 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt @@ -5,7 +5,7 @@ package test @test.Anno(t = {}) public fun baz(): kotlin.Unit @test.Anno(t = {ElementType.METHOD, ElementType.FIELD}) public fun foo(): kotlin.Unit -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ vararg t: java.lang.annotation.ElementType /*kotlin.Array*/) public final val t: kotlin.Array public final fun (): kotlin.Array diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt index 7151484677a..c94eb67754a 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt @@ -2,6 +2,6 @@ package test @test.Anno() public fun function(): kotlin.Unit -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt index 79c688a588d..330075011ea 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt @@ -3,6 +3,6 @@ package test public val property: kotlin.Int @test.Anno() public fun (): kotlin.Int -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt index f0b9727a800..96a3a240250 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt @@ -4,6 +4,6 @@ package test public fun (): kotlin.Int public fun (/*0*/ : kotlin.Int): kotlin.Unit -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt index 1081078e840..55a70ee11a0 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt @@ -4,6 +4,6 @@ public var property: kotlin.Int public fun (): kotlin.Int @test.Anno() public fun (/*0*/ value: kotlin.Int): kotlin.Unit -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt index a09f9d3b0ab..f524b79c296 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt @@ -5,7 +5,7 @@ package test @test.Anno(t = {}) public fun baz(): kotlin.Unit @test.Anno(t = {"live", "long"}) public fun foo(): kotlin.Unit -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ vararg t: kotlin.String /*kotlin.Array*/) public final val t: kotlin.Array public final fun (): kotlin.Array diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt index 69288c9a56c..82c15bac0dd 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt @@ -1,10 +1,10 @@ package test -@kotlin.annotation.annotation() public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } -@kotlin.annotation.annotation() public final class B : kotlin.Annotation { +public final annotation class B : kotlin.Annotation { /*primary*/ public constructor B() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt index d51e943ea55..dae063c3d6c 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt @@ -1,10 +1,10 @@ package test -@kotlin.annotation.annotation() public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } -@kotlin.annotation.annotation() public final class B : kotlin.Annotation { +public final annotation class B : kotlin.Annotation { /*primary*/ public constructor B() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt index 0d5358e4c69..a1512a5a7ed 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt @@ -2,6 +2,6 @@ package test public fun kotlin.Int.foo(/*0*/ @test.A() x: kotlin.Int): kotlin.Unit -@kotlin.annotation.annotation() public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt index d0a033a16e6..6e18f0390c2 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt index 19c853c9291..a28155de459 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt index 565edf4175e..af1d36bcd4a 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt index fe4dcfb4a49..fdc5b58bbd3 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.txt index e24d0c9354c..824d5f9b9de 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A(/*0*/ s: kotlin.String) public final val s: kotlin.String public final fun (): kotlin.String diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt index 0438d279290..cb7bbd8afae 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt @@ -3,18 +3,18 @@ package test public fun bar(/*0*/ @test.A() @test.B() @test.C() @test.D() x: kotlin.Int): kotlin.Unit public fun foo(/*0*/ @test.A() @test.B() x: kotlin.Int, /*1*/ @test.A() @test.C() y: kotlin.Double, /*2*/ @test.B() @test.C() @test.D() z: kotlin.String): kotlin.Unit -@kotlin.annotation.annotation() public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } -@kotlin.annotation.annotation() public final class B : kotlin.Annotation { +public final annotation class B : kotlin.Annotation { /*primary*/ public constructor B() } -@kotlin.annotation.annotation() public final class C : kotlin.Annotation { +public final annotation class C : kotlin.Annotation { /*primary*/ public constructor C() } -@kotlin.annotation.annotation() public final class D : kotlin.Annotation { +public final annotation class D : kotlin.Annotation { /*primary*/ public constructor D() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt index 908ea64acca..410bc274916 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt index 2453554d121..194991f0a58 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt @@ -2,6 +2,6 @@ package test public fun foo(/*0*/ @test.Anno() x: kotlin.Int): kotlin.Unit -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt index 291a30013ca..e4c0a41414e 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt @@ -4,10 +4,10 @@ public var foo: kotlin.Int public fun (): kotlin.Int public fun (/*0*/ @test.A() @test.B() value: kotlin.Int): kotlin.Unit -@kotlin.annotation.annotation() public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } -@kotlin.annotation.annotation() public final class B : kotlin.Annotation { +public final annotation class B : kotlin.Annotation { /*primary*/ public constructor B() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt index 8c8df7d6d83..21d8a830cc9 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt index 2f9303e2c89..ae374d4d295 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt index 354ea9e9a44..74bd50082ed 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt @@ -10,14 +10,14 @@ public final class Class { public final fun kotlin.String.(): kotlin.String } -@kotlin.annotation.annotation() public final class DoubleAnno : kotlin.Annotation { +public final annotation class DoubleAnno : kotlin.Annotation { /*primary*/ public constructor DoubleAnno() } -@kotlin.annotation.annotation() public final class IntAnno : kotlin.Annotation { +public final annotation class IntAnno : kotlin.Annotation { /*primary*/ public constructor IntAnno() } -@kotlin.annotation.annotation() public final class StringAnno : kotlin.Annotation { +public final annotation class StringAnno : kotlin.Annotation { /*primary*/ public constructor StringAnno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt index de5e02601ae..62789193f02 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt @@ -7,14 +7,14 @@ package test @test.StringAnno() public val kotlin.String.extension: kotlin.String public fun kotlin.String.(): kotlin.String -@kotlin.annotation.annotation() public final class DoubleAnno : kotlin.Annotation { +public final annotation class DoubleAnno : kotlin.Annotation { /*primary*/ public constructor DoubleAnno() } -@kotlin.annotation.annotation() public final class IntAnno : kotlin.Annotation { +public final annotation class IntAnno : kotlin.Annotation { /*primary*/ public constructor IntAnno() } -@kotlin.annotation.annotation() public final class StringAnno : kotlin.Annotation { +public final annotation class StringAnno : kotlin.Annotation { /*primary*/ public constructor StringAnno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt index 79650e6db64..f03bfb85277 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt index edb5536aff6..9bbe27db8ca 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt @@ -3,6 +3,6 @@ package test @test.Anno() public val property: kotlin.Int public fun (): kotlin.Int -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt index 61c03794b37..2c81e2fb706 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt index 75a298fdb77..d5354c038d4 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt index 8e15f6ac2f3..b8aef7a90e0 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt @@ -2,6 +2,6 @@ package test public fun @test.A() kotlin.String.foo(): kotlin.Unit -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class A : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt index 102854ac633..5c758dfcb9a 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class A : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt index 45ac2ced2b0..244289f0fab 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt index 6c425f9137d..e920c01e936 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class Ann : kotlin.Annotation { /*primary*/ public constructor Ann(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Double) public final val x: kotlin.String public final fun (): kotlin.String diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.txt index 87bdd862f69..0b35ce596c4 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.annotation() public final class A : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt index d18a79a6808..6c3cc6ec5bf 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) @kotlin.annotation.annotation() public final class A : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Double) public final val x: kotlin.String public final fun (): kotlin.String diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt index e06f0cd9701..ee18c636f85 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class Anno : kotlin.Annotation { +public final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt index ec9905404a2..32e3fe85237 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt @@ -10,6 +10,6 @@ public final class A { public final fun @receiver:test.Ann() kotlin.String.myLength(/*0*/ @test.Ann() q: kotlin.String): kotlin.Int } -@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) @kotlin.annotation.annotation() public final class Ann : kotlin.Annotation { +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final annotation class Ann : kotlin.Annotation { /*primary*/ public constructor Ann() } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt index 1fe17863856..f02742eaa6b 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt @@ -6,7 +6,7 @@ public final class Some { @test.Some.Companion.TestAnnotation() public companion object Companion { /*primary*/ private constructor Companion() - @kotlin.annotation.annotation() public final class TestAnnotation : kotlin.Annotation { + public final annotation class TestAnnotation : kotlin.Annotation { /*primary*/ public constructor TestAnnotation() } } diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.txt index d5da0cd326f..1b02e351c5d 100644 --- a/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.txt +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.txt @@ -5,7 +5,7 @@ package test @kotlin.platform.platformName(name = "vset") @test.A(s = "4") public fun (/*0*/ : kotlin.Int): kotlin.Unit @kotlin.platform.platformName(name = "bar") @test.A(s = "1") public fun foo(): kotlin.String -@kotlin.annotation.annotation() public final class A : kotlin.Annotation { +public final annotation class A : kotlin.Annotation { /*primary*/ public constructor A(/*0*/ s: kotlin.String) public final val s: kotlin.String public final fun (): kotlin.String diff --git a/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt b/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt index 60e0b2b5e6a..932dadfd12a 100644 --- a/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt +++ b/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt @@ -5,7 +5,7 @@ public /*synthesized*/ fun NullInAnnotation(/*0*/ function: () -> kotlin.Unit): public interface NullInAnnotation { @test.NullInAnnotation.Ann(a = null, b = {null}) public abstract fun foo(): kotlin.Unit - public final class Ann : kotlin.Annotation { + public final annotation class Ann : kotlin.Annotation { public constructor Ann(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Array) public final val a: kotlin.String public final val b: kotlin.Array diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt index 9e8c158c976..4eeffb3d49e 100644 --- a/compiler/testData/renderer/Classes.kt +++ b/compiler/testData/renderer/Classes.kt @@ -35,9 +35,9 @@ public class WithReified public interface TwoUpperBounds where T : Number, T : Any //package rendererTest -//@kotlin.annotation.annotation public final class TheAnnotation : kotlin.Annotation defined in rendererTest +//public final annotation class TheAnnotation : kotlin.Annotation defined in rendererTest //public constructor TheAnnotation() defined in rendererTest.TheAnnotation -//@kotlin.annotation.annotation public final class AnotherAnnotation : kotlin.Annotation defined in rendererTest +//public final annotation class AnotherAnnotation : kotlin.Annotation defined in rendererTest //public constructor AnotherAnnotation() defined in rendererTest.AnotherAnnotation //@rendererTest.TheAnnotation public open class TheClass defined in rendererTest // defined in rendererTest.TheClass diff --git a/compiler/testData/renderer/KeywordsInNames.kt b/compiler/testData/renderer/KeywordsInNames.kt index 10a68b35e2e..bf24c6ec2f5 100644 --- a/compiler/testData/renderer/KeywordsInNames.kt +++ b/compiler/testData/renderer/KeywordsInNames.kt @@ -17,7 +17,7 @@ val AS_SAFE = 1 val NOT_IN = 2 val NOT_IS = 3 -//@kotlin.annotation.annotation public final class `true` : kotlin.Annotation defined in root package +//public final annotation class `true` : kotlin.Annotation defined in root package //public constructor `true`() defined in `true` //public val `val`: kotlin.Int defined in root package //@`true` public interface `interface` defined in root package diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt index 3d38cc5ad22..100c97e7ed4 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt @@ -1,6 +1,6 @@ package test -@kotlin.annotation.annotation() public final class AnnotationArray : kotlin.Annotation { +public final annotation class AnnotationArray : kotlin.Annotation { public constructor AnnotationArray(/*0*/ annotationArray: kotlin.Array) public final val annotationArray: kotlin.Array } @@ -13,11 +13,11 @@ package test public constructor C2() } -@kotlin.annotation.annotation() public final class Empty : kotlin.Annotation { +public final annotation class Empty : kotlin.Annotation { public constructor Empty() } -@kotlin.annotation.annotation() public final class JustAnnotation : kotlin.Annotation { +public final annotation class JustAnnotation : kotlin.Annotation { public constructor JustAnnotation(/*0*/ annotation: test.Empty) public final val annotation: test.Empty } diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt index 709bbd77a09..6955aac82de 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt @@ -8,12 +8,12 @@ package test public constructor C2() } -@kotlin.annotation.annotation() public final class EnumArray : kotlin.Annotation { +public final annotation class EnumArray : kotlin.Annotation { public constructor EnumArray(/*0*/ enumArray: kotlin.Array) public final val enumArray: kotlin.Array } -@kotlin.annotation.annotation() public final class JustEnum : kotlin.Annotation { +public final annotation class JustEnum : kotlin.Annotation { public constructor JustEnum(/*0*/ weapon: test.Weapon) public final val weapon: test.Weapon } diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt index 50c9ae75ab5..97d61a65e29 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt @@ -8,7 +8,7 @@ package test public constructor C2() } -@kotlin.annotation.annotation() public final class PrimitiveArrays : kotlin.Annotation { +public final annotation class PrimitiveArrays : kotlin.Annotation { public constructor PrimitiveArrays(/*0*/ byteArray: kotlin.ByteArray, /*1*/ charArray: kotlin.CharArray, /*2*/ shortArray: kotlin.ShortArray, /*3*/ intArray: kotlin.IntArray, /*4*/ longArray: kotlin.LongArray, /*5*/ floatArray: kotlin.FloatArray, /*6*/ doubleArray: kotlin.DoubleArray, /*7*/ booleanArray: kotlin.BooleanArray) public final val booleanArray: kotlin.BooleanArray public final val byteArray: kotlin.ByteArray diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt index 1876bc4aff2..8194cd63f11 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt @@ -4,7 +4,7 @@ package test public constructor C() } -@kotlin.annotation.annotation() public final class Primitives : kotlin.Annotation { +public final annotation class Primitives : kotlin.Annotation { public constructor Primitives(/*0*/ byte: kotlin.Byte, /*1*/ char: kotlin.Char, /*2*/ short: kotlin.Short, /*3*/ int: kotlin.Int, /*4*/ long: kotlin.Long, /*5*/ float: kotlin.Float, /*6*/ double: kotlin.Double, /*7*/ boolean: kotlin.Boolean) public final val boolean: kotlin.Boolean public final val byte: kotlin.Byte diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt index aaae9f64b68..e280b342b9c 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt @@ -8,12 +8,12 @@ package test public constructor C2() } -@kotlin.annotation.annotation() public final class JustString : kotlin.Annotation { +public final annotation class JustString : kotlin.Annotation { public constructor JustString(/*0*/ string: kotlin.String) public final val string: kotlin.String } -@kotlin.annotation.annotation() public final class StringArray : kotlin.Annotation { +public final annotation class StringArray : kotlin.Annotation { public constructor StringArray(/*0*/ stringArray: kotlin.Array) public final val stringArray: kotlin.Array } diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt index 793c7def20a..9a1eab59e4c 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt @@ -19,11 +19,11 @@ public final enum class My : kotlin.Enum { @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array } -@kotlin.annotation.annotation() public final class ann : kotlin.Annotation { +public final annotation class ann : kotlin.Annotation { public constructor ann(/*0*/ vararg m: test.My /*kotlin.Array*/) public final val m: kotlin.Array } -@test.ann(m = {My.ALPHA, My.BETA}) @kotlin.annotation.annotation() public final class annotated : kotlin.Annotation { +@test.ann(m = {My.ALPHA, My.BETA}) public final annotation class annotated : kotlin.Annotation { public constructor annotated() } diff --git a/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt b/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt index 5501513b114..bad57563ce4 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt +++ b/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt @@ -21,7 +21,7 @@ package test } } -@kotlin.annotation.annotation() public final class anno : kotlin.Annotation { +public final annotation class anno : kotlin.Annotation { public constructor anno(/*0*/ x: kotlin.String) public final val x: kotlin.String }