Rendering changed: "annotation class" is now just "class" (with kotlin.annotation.annotation if it's kotlin annotation).

A swarm of tests fixed accordingly.

compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt

@@ -1,10 +1,10 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
-kotlin.annotation.annotation() internal final annotation class B : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class B : kotlin.Annotation {
     /*primary*/ public constructor B()
 }
 

compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt

@@ -1,10 +1,10 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
-kotlin.annotation.annotation() internal final annotation class B : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class B : kotlin.Annotation {
     /*primary*/ public constructor B()
 }
 

compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt

@@ -2,6 +2,6 @@ package test
 
 internal fun kotlin.Int.foo(/*0*/ test.A() x: kotlin.Int): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }

compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt

@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 

compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt

@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 

compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt

@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 

compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt

@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 

compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.txt

@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A(/*0*/ s: kotlin.String)
     internal final val s: kotlin.String
         internal final fun <get-s>(): kotlin.String

compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt

@@ -3,18 +3,18 @@ package test
 internal fun bar(/*0*/ test.A() test.B() test.C() test.D() x: kotlin.Int): kotlin.Unit
 internal 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() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
-kotlin.annotation.annotation() internal final annotation class B : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class B : kotlin.Annotation {
     /*primary*/ public constructor B()
 }
 
-kotlin.annotation.annotation() internal final annotation class C : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class C : kotlin.Annotation {
     /*primary*/ public constructor C()
 }
 
-kotlin.annotation.annotation() internal final annotation class D : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class D : kotlin.Annotation {
     /*primary*/ public constructor D()
 }

compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt

@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 

compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt

@@ -2,6 +2,6 @@ package test
 
 internal fun foo(/*0*/ test.Anno() x: kotlin.Int): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }

compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt

@@ -4,10 +4,10 @@ internal var foo: kotlin.Int
     internal fun <get-foo>(): kotlin.Int
     internal fun <set-foo>(/*0*/ test.A() test.B() value: kotlin.Int): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
-kotlin.annotation.annotation() internal final annotation class B : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class B : kotlin.Annotation {
     /*primary*/ public constructor B()
 }