Remove @annotation from test data

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()
 }

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
     }

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
     }

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
     }

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.String!>!): 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
     }

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<out kotlin.String>*/)
         public final val value: kotlin.Array<kotlin.String>
     }
 
-    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
     }

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()
     }
 

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()
     }
 }

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
     }

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
     }

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<out kotlin.String>*/)
         public final val value: kotlin.Array<kotlin.String>
     }

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<out kotlin.reflect.KClass<*>>*/)
         public final val value: kotlin.Array<kotlin.reflect.KClass<*>>
     }

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<*>
     }

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<kotlin.reflect.KClass<*>>)
         public final val arg: kotlin.Array<kotlin.reflect.KClass<*>>
         public final val value: kotlin.reflect.KClass<*>

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<out kotlin.Int!>, /*1*/ arg2: kotlin.reflect.KClass<in kotlin.Int!>, /*2*/ arg3: kotlin.Array<kotlin.reflect.KClass<out kotlin.Int!>>, /*3*/ arg4: kotlin.Array<kotlin.reflect.KClass<in kotlin.Int!>>, /*4*/ arg5: kotlin.Array<kotlin.reflect.KClass<out java.lang.Class<*>!>>, /*5*/ arg6: kotlin.Array<kotlin.reflect.KClass<in java.lang.Class<*>!>>, /*6*/ arg7: kotlin.Array<kotlin.reflect.KClass<out java.lang.Class<kotlin.Int!>!>>, /*7*/ arg8: kotlin.Array<kotlin.reflect.KClass<in java.lang.Class<kotlin.Int!>!>>)
         public final val arg1: kotlin.reflect.KClass<out kotlin.Int!>
         public final val arg2: kotlin.reflect.KClass<in kotlin.Int!>

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
     }

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

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<out kotlin.String>*/)
         public final val value: kotlin.Array<kotlin.String>
     }

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<test.EnumArgumentWithCustomToString.E>
     }
 
-    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<out test.EnumArgumentWithCustomToString.E>*/)
         public final val value: kotlin.Array<test.EnumArgumentWithCustomToString.E>
     }

compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt

@@ -10,7 +10,7 @@ public final enum class EnumConstructorParameter : kotlin.Enum<test.EnumConstruc
     protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumConstructorParameter!): kotlin.Int
 
-    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
     }

compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt

@@ -2,12 +2,12 @@ package test
 
 public interface EnumInParam {
 
-    public final class MyRetention : kotlin.Annotation {
+    public final annotation class MyRetention : kotlin.Annotation {
         public constructor MyRetention(/*0*/ value: java.lang.annotation.RetentionPolicy)
         public final val value: java.lang.annotation.RetentionPolicy
     }
 
-    @test.EnumInParam.MyRetention(value = RetentionPolicy.RUNTIME) public final class RetentionAnnotation : kotlin.Annotation {
+    @test.EnumInParam.MyRetention(value = RetentionPolicy.RUNTIME) public final annotation class RetentionAnnotation : kotlin.Annotation {
         public constructor RetentionAnnotation(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
     }

compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt

@@ -4,7 +4,7 @@ public open class NestedEnumArgument {
     public constructor NestedEnumArgument()
     @test.NestedEnumArgument.Anno(value = E.FIRST) public/*package*/ open fun foo(): kotlin.Unit
 
-    public final class Anno : kotlin.Annotation {
+    public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: test.NestedEnumArgument.E)
         public final val value: test.NestedEnumArgument.E
     }

compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt

@@ -6,7 +6,7 @@ public interface PrimitiveValueInParam {
         public constructor A()
     }
 
-    public final class Ann : kotlin.Annotation {
+    public final annotation class Ann : kotlin.Annotation {
         public constructor Ann(/*0*/ i: kotlin.Int, /*1*/ l: kotlin.Long, /*2*/ d: kotlin.Double, /*3*/ f: kotlin.Float, /*4*/ bool: kotlin.Boolean, /*5*/ str: kotlin.String)
         public final val bool: kotlin.Boolean
         public final val d: kotlin.Double

compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt

@@ -2,12 +2,12 @@ package test
 
 public interface RecursiveAnnotation {
 
-    @test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final class A : kotlin.Annotation {
+    @test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final annotation class A : kotlin.Annotation {
         public constructor A(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
     }
 
-    @test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final class B : kotlin.Annotation {
+    @test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final annotation class B : kotlin.Annotation {
         public constructor B(/*0*/ value: test.RecursiveAnnotation.A)
         public final val value: test.RecursiveAnnotation.A
     }

compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt

@@ -2,12 +2,12 @@ package test
 
 public interface RecursiveAnnotation2 {
 
-    public final class A : kotlin.Annotation {
+    public final annotation class A : kotlin.Annotation {
         public constructor A(/*0*/ value: test.RecursiveAnnotation2.B)
         public final val value: test.RecursiveAnnotation2.B
     }
 
-    @test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test")) public final class B : kotlin.Annotation {
+    @test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test")) public final annotation class B : kotlin.Annotation {
         public constructor B(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
     }

compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.txt

@@ -1,5 +1,5 @@
 package test
 
-public final class SimpleAnnotation : kotlin.Annotation {
+public final annotation class SimpleAnnotation : kotlin.Annotation {
     public constructor SimpleAnnotation()
 }

compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt

@@ -2,7 +2,7 @@ package test
 
 public interface StringConcatenationInParam {
 
-    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
     }

compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt

@@ -2,7 +2,7 @@ package test
 
 public interface StringConstantInParam {
 
-    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
     }

compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt

@@ -2,7 +2,7 @@ package test
 
 public interface StringInParam {
 
-    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
     }