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/classes/AnnotationInClassObject.txt

@@ -6,14 +6,14 @@ internal final class A {
     public companion object Companion {
         /*primary*/ private constructor Companion()
 
-        kotlin.annotation.annotation() internal final annotation class Anno1 : kotlin.Annotation {
+        kotlin.annotation.annotation() internal final class Anno1 : kotlin.Annotation {
             /*primary*/ public constructor Anno1()
         }
 
         internal final class B {
             /*primary*/ public constructor B()
 
-            kotlin.annotation.annotation() internal final annotation class Anno2 : kotlin.Annotation {
+            kotlin.annotation.annotation() internal final class Anno2 : kotlin.Annotation {
                 /*primary*/ public constructor Anno2()
             }
         }

compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.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/classes/ClassObject.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/classes/DollarsInAnnotationName.txt

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

compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.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(/*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/classes/MultipleAnnotations.txt

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

compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt

@@ -3,7 +3,7 @@ package test
 internal final class A {
     /*primary*/ public constructor A()
 
-    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/classes/NestedClass.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/classes/Retention.txt

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

compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.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/classes/WithArgument.txt

@@ -1,18 +1,18 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class BooleanAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class BooleanAnno : kotlin.Annotation {
     /*primary*/ public constructor BooleanAnno(/*0*/ value: kotlin.Boolean)
     internal final val value: kotlin.Boolean
         internal final fun <get-value>(): kotlin.Boolean
 }
 
-kotlin.annotation.annotation() internal final annotation class ByteAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ByteAnno : kotlin.Annotation {
     /*primary*/ public constructor ByteAnno(/*0*/ value: kotlin.Byte)
     internal final val value: kotlin.Byte
         internal final fun <get-value>(): kotlin.Byte
 }
 
-kotlin.annotation.annotation() internal final annotation class CharAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class CharAnno : kotlin.Annotation {
     /*primary*/ public constructor CharAnno(/*0*/ value: kotlin.Char)
     internal final val value: kotlin.Char
         internal final fun <get-value>(): kotlin.Char
@@ -22,31 +22,31 @@ test.IntAnno(value = 42) test.ShortAnno(value = 42.toShort()) test.ByteAnno(valu
     /*primary*/ public constructor Class()
 }
 
-kotlin.annotation.annotation() internal final annotation class DoubleAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class DoubleAnno : kotlin.Annotation {
     /*primary*/ public constructor DoubleAnno(/*0*/ value: kotlin.Double)
     internal final val value: kotlin.Double
         internal final fun <get-value>(): kotlin.Double
 }
 
-kotlin.annotation.annotation() internal final annotation class FloatAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class FloatAnno : kotlin.Annotation {
     /*primary*/ public constructor FloatAnno(/*0*/ value: kotlin.Float)
     internal final val value: kotlin.Float
         internal final fun <get-value>(): kotlin.Float
 }
 
-kotlin.annotation.annotation() internal final annotation class IntAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class IntAnno : kotlin.Annotation {
     /*primary*/ public constructor IntAnno(/*0*/ value: kotlin.Int)
     internal final val value: kotlin.Int
         internal final fun <get-value>(): kotlin.Int
 }
 
-kotlin.annotation.annotation() internal final annotation class LongAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class LongAnno : kotlin.Annotation {
     /*primary*/ public constructor LongAnno(/*0*/ value: kotlin.Long)
     internal final val value: kotlin.Long
         internal final fun <get-value>(): kotlin.Long
 }
 
-kotlin.annotation.annotation() internal final annotation class ShortAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ShortAnno : kotlin.Annotation {
     /*primary*/ public constructor ShortAnno(/*0*/ value: kotlin.Short)
     internal final val value: kotlin.Short
         internal final fun <get-value>(): kotlin.Short

compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.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(/*0*/ int: kotlin.Int, /*1*/ string: kotlin.String, /*2*/ double: kotlin.Double)
     internal final val double: kotlin.Double
         internal final fun <get-double>(): kotlin.Double