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/packageMembers/DelegatedProperty.txt

@@ -3,6 +3,6 @@ package test
 test.Anno() internal val x: kotlin.Int
     internal fun <get-x>(): kotlin.Int
 
-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/packageMembers/EnumArgument.txt

@@ -4,7 +4,7 @@ test.Anno(t = ElementType.FIELD) internal val bar: kotlin.Int = 42
     internal fun <get-bar>(): kotlin.Int
 test.Anno(t = ElementType.METHOD) internal fun foo(): 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(/*0*/ t: java.lang.annotation.ElementType)
     internal final val t: java.lang.annotation.ElementType
         internal final fun <get-t>(): java.lang.annotation.ElementType

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt

@@ -5,7 +5,7 @@ test.Anno(t = {ElementType.PACKAGE}) internal val bar: kotlin.Int = 42
 test.Anno(t = {}) internal fun baz(): kotlin.Unit
 test.Anno(t = {ElementType.METHOD, ElementType.FIELD}) internal fun foo(): 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(/*0*/ vararg t: java.lang.annotation.ElementType /*kotlin.Array<out java.lang.annotation.ElementType>*/)
     internal final val t: kotlin.Array<out java.lang.annotation.ElementType>
         internal final fun <get-t>(): kotlin.Array<out java.lang.annotation.ElementType>

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt

@@ -2,6 +2,6 @@ package test
 
 test.Anno() internal fun function(): 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/packageMembers/Getter.txt

@@ -3,6 +3,6 @@ package test
 internal val property: kotlin.Int
     test.Anno() internal fun <get-property>(): kotlin.Int
 
-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/packageMembers/PropertyField.txt

@@ -4,6 +4,6 @@ test.Anno() internal var property: kotlin.Int
     internal fun <get-property>(): kotlin.Int
     internal fun <set-property>(/*0*/ <set-?>: 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/packageMembers/Setter.txt

@@ -4,6 +4,6 @@ internal var property: kotlin.Int
     internal fun <get-property>(): kotlin.Int
     test.Anno() internal fun <set-property>(/*0*/ value: 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/packageMembers/StringArrayArgument.txt

@@ -5,7 +5,7 @@ test.Anno(t = {"prosper"}) internal val bar: kotlin.Int = 42
 test.Anno(t = {}) internal fun baz(): kotlin.Unit
 test.Anno(t = {"live", "long"}) internal fun foo(): 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(/*0*/ vararg t: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     internal final val t: kotlin.Array<out kotlin.String>
         internal final fun <get-t>(): kotlin.Array<out kotlin.String>