Fix UL-classes test renders and test data

compiler/testData/asJava/ultraLightClasses/annotations.kt

@@ -1,9 +1,29 @@
 import kotlin.reflect.KClass
 
-/** should load cls */
-annotation class Anno(val p: String = "", val x: Array<Anno> = arrayOf(Anno(p="a"), Anno(p="b")))
+@Target(*[AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION])
+annotation class Anno2()
 
-/** should load cls */
+@Target(allowedTargets = [AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION])
+annotation class Anno3()
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION)
+annotation class Anno4()
+
+@Target(*arrayOf(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION))
+annotation class Anno5()
+
+@Target(allowedTargets = arrayOf(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION))
+annotation class Anno6()
+
+annotation class AnnoWithCompanion() {
+    companion object {
+        fun foo() {}
+        @JvmField
+        val x: Int = 42
+    }
+}
+
+annotation class Anno(val p: String = "", val x: Array<Anno> = arrayOf(Anno(p = "a"), Anno(p = "b")))
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION,
         AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION)
 @Retention(AnnotationRetention.SOURCE)
@@ -11,15 +31,14 @@ annotation class Anno(val p: String = "", val x: Array<Anno> = arrayOf(Anno(p="a
 @Deprecated("This anno is deprecated, use === instead", ReplaceWith("this === other"))
 annotation class Fancy
 
-/** should load cls */
 annotation class ReplaceWith(val expression: String)
 
-/** should load cls */
+annotation class AnnotatedAttribute(@get:Anno val x: String)
+
 annotation class Deprecated(
     val message: String,
     val replaceWith: ReplaceWith = ReplaceWith(""))
 
-/** should load cls */
 annotation class Ann(val arg1: KClass<*>, val arg2: KClass<out Any>)
 
 
@@ -39,6 +58,6 @@ class Foo @Anno constructor(dependency: MyDependency) {
 
 @Ann(String::class, Int::class) class MyClass
 
-class Example(@field:Ann val foo,    // annotate Java field
-              @get:Ann val bar,      // annotate Java getter
-              @param:Ann val quux)   // annotate Java constructor parameter
+class Example(@field:Ann val foo: String,    // annotate Java field
+              @get:Ann val bar: String,      // annotate Java getter
+              @param:Ann val quux: String)   // annotate Java constructor parameter

compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.java

@@ -1,11 +1,11 @@
-@java.lang.annotation.Retention(null=java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface SimpleAnn /* SimpleAnn*/ {
   @null()
   public abstract java.lang.String value();
 
 }
 
-@java.lang.annotation.Retention(null=java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface Ann /* Ann*/ {
   @null()
   public abstract SimpleAnn[] t();
@@ -27,16 +27,16 @@ public abstract @interface Ann /* Ann*/ {
 }
 
 public abstract interface Base /* Base*/ {
-  @Ann(null=1, null="134", null=String::class, null=arrayOf(Int::class, Double::class), null=DeprecationLevel.WARNING, null=SimpleAnn("243"), null=SimpleAnn("4324"))
-  public abstract void foo(@Ann(null=2, null="324", null=Ann::class, null=arrayOf(Byte::class, Base::class), null=DeprecationLevel.WARNING, null=SimpleAnn("687"), null=SimpleAnn("78")) @org.jetbrains.annotations.NotNull() java.lang.String);
+  @Ann(x = 1, y = "134", z = String::class, e = {Int::class, Double::class}, depr = DeprecationLevel.WARNING, t = {@SimpleAnn(value = "243"), @SimpleAnn(value = "4324")})
+  public abstract void foo(@Ann(x = 2, y = "324", z = Ann::class, e = {Byte::class, Base::class}, depr = DeprecationLevel.WARNING, t = {@SimpleAnn(value = "687"), @SimpleAnn(value = "78")}) @org.jetbrains.annotations.NotNull() java.lang.String);
 
 }
 
 public final class Derived /* Derived*/ implements Base {
-  @Ann(x=1, y="134", z=java.lang.String.class, e={int.class, double.class}, depr=kotlin.DeprecationLevel.WARNING, t={@SimpleAnn(value="243"), @SimpleAnn(value="4324")})
-  public void foo(@Ann(x=2, y="324", z=Ann.class, e={byte.class, Base.class}, depr=kotlin.DeprecationLevel.WARNING, t={@SimpleAnn(value="687"), @SimpleAnn(value="78")}) @org.jetbrains.annotations.NotNull() java.lang.String);
+  @Ann(x = 1, y = "134", z = java.lang.String.class, e = {int.class, double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value="243"), @SimpleAnn(value="4324")})
+  public void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value="687"), @SimpleAnn(value="78")}) @org.jetbrains.annotations.NotNull() java.lang.String);
 
   @null()
   public  Derived(@org.jetbrains.annotations.NotNull() Base);
 
-}
+}

compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.kt

@@ -1,15 +1,13 @@
 import kotlin.reflect.KClass
 
-/** should load cls */
 annotation class SimpleAnn(val value: String)
 
-/** should load cls */
 annotation class Ann(
     val x: Int,
     val y: String,
     val z: KClass<*>,
     val e: Array<KClass<*>>,
-    val depr: DeprecationLevel
+    val depr: DeprecationLevel,
     vararg val t: SimpleAnn
 )