Update lightclass tests renderer

+mute invalid old light classes tests

compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java

@@ -1,72 +1,85 @@
-public final class Class {
-    @org.jetbrains.annotations.Nullable
-    private final java.lang.String nullableVal;
-    @org.jetbrains.annotations.Nullable
-    private java.lang.String nullableVar;
-    @org.jetbrains.annotations.NotNull
-    private final java.lang.String notNullVal;
-    @org.jetbrains.annotations.NotNull
-    private java.lang.String notNullVar;
-    private final java.lang.String privateNN;
-    private final java.lang.String privateN;
+public final class Class /* Class*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String notNullVal;
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  private java.lang.String notNullVar;
 
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private final java.lang.String nullableVal;
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String notNullWithNN() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private java.lang.String nullableVar;
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String notNullWithN() { /* compiled code */ }
+  private final java.lang.String privateN;
 
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String nullableWithN() { /* compiled code */ }
+  private final java.lang.String privateNN;
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String nullableWithNN() { /* compiled code */ }
+  public java.lang.String lateInitVar;
 
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String getNullableVal() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNotNullValWithGet();//  getNotNullValWithGet()
 
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String getNullableVar() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNotNullVarWithGetSet();//  getNotNullVarWithGetSet()
 
-    public final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNullableValWithGet();//  getNullableValWithGet()
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getNotNullVal() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNullableVarWithGetSet();//  getNullableVarWithGetSet()
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getNotNullVar() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String notNullWithN();//  notNullWithN()
 
-    public final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String nullableWithNN();//  nullableWithNN()
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getNotNullValWithGet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getLateInitVar();//  getLateInitVar()
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getNotNullVal();//  getNotNullVal()
 
-    @org.jetbrains.annotations.Nullable
-    public final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getNotNullVar();//  getNotNullVar()
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String getNullableValWithGet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String notNull(@org.jetbrains.annotations.NotNull() java.lang.String);//  notNull(java.lang.String)
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String getNullableVarWithGetSet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String notNullWithNN();//  notNullWithNN()
 
-    @org.jetbrains.annotations.NotNull
-    public final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable() java.lang.String);//  setNullableVarWithGetSet(java.lang.String)
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNullableVal();//  getNullableVal()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNullableVar();//  getNullableVar()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String nullable(@org.jetbrains.annotations.Nullable() java.lang.String);//  nullable(java.lang.String)
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String nullableWithN();//  nullableWithN()
+
+  @org.jetbrains.annotations.Nullable()
+  public final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull() java.lang.String);//  setNotNullVarWithGetSet(java.lang.String)
+
+  public  Class();//  .ctor()
+
+  public final void setLateInitVar(@org.jetbrains.annotations.NotNull() java.lang.String);//  setLateInitVar(java.lang.String)
+
+  public final void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);//  setNotNullVar(java.lang.String)
+
+  public final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);//  setNullableVar(java.lang.String)
 
-    public Class() { /* compiled code */ }
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt

@@ -34,4 +34,6 @@ class Class {
 
     private val privateNN: String = { "" }()
     private val privateN: String? = { "" }()
+
+    lateinit var lateInitVar: String
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java

@@ -1,16 +1,19 @@
-public final class ClassObjectField {
-    @org.jetbrains.annotations.Nullable
-    private static final java.lang.String x;
-    private static final java.lang.String y;
-    @org.jetbrains.annotations.NotNull
-    public static final ClassObjectField.Companion Companion;
+public final class ClassObjectField /* ClassObjectField*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final ClassObjectField.Companion Companion;
 
-    public ClassObjectField() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private static final java.lang.String x;
 
-    public static final class Companion {
-        @org.jetbrains.annotations.Nullable
-        public final java.lang.String getX() { /* compiled code */ }
+  private static final java.lang.String y;
 
-        private Companion() { /* compiled code */ }
-    }
-}
+  public  ClassObjectField();//  .ctor()
+
+
+public static final class Companion /* ClassObjectField.Companion*/ {
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getX();//  getX()
+
+  private  Companion();//  .ctor()
+
+}}

compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java

@@ -1,3 +1,4 @@
-public final class ClassWithConstructor {
-    public ClassWithConstructor(@org.jetbrains.annotations.Nullable java.lang.String nullable, @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
+public final class ClassWithConstructor /* ClassWithConstructor*/ {
+  public  ClassWithConstructor(@org.jetbrains.annotations.Nullable() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, java.lang.String)
+
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java

@@ -1,14 +1,16 @@
-public final class ClassWithConstructorAndProperties {
-    @org.jetbrains.annotations.Nullable
-    private final java.lang.String nullable;
-    @org.jetbrains.annotations.NotNull
-    private final java.lang.String notNull;
+public final class ClassWithConstructorAndProperties /* ClassWithConstructorAndProperties*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String notNull;
 
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String getNullable() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private final java.lang.String nullable;
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getNotNull() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getNotNull();//  getNotNull()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNullable();//  getNullable()
+
+  public  ClassWithConstructorAndProperties(@org.jetbrains.annotations.Nullable() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, java.lang.String)
 
-    public ClassWithConstructorAndProperties(@org.jetbrains.annotations.Nullable java.lang.String nullable, @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java

@@ -1,72 +1,78 @@
-public final class FileFacadeKt {
-    @org.jetbrains.annotations.Nullable
-    private static final java.lang.String nullableVal;
-    @org.jetbrains.annotations.Nullable
-    private static java.lang.String nullableVar;
-    @org.jetbrains.annotations.NotNull
-    private static final java.lang.String notNullVal;
-    @org.jetbrains.annotations.NotNull
-    private static java.lang.String notNullVar;
-    private static final java.lang.String privateNn;
-    private static final java.lang.String privateN;
+public final class FileFacadeKt /* FileFacadeKt*/ {
+  @org.jetbrains.annotations.NotNull()
+  private static final java.lang.String notNullVal;
 
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  private static java.lang.String notNullVar;
 
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private static final java.lang.String nullableVal;
 
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String notNullWithNN() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private static java.lang.String nullableVar;
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String notNullWithN() { /* compiled code */ }
+  private static final java.lang.String privateN;
 
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String nullableWithN() { /* compiled code */ }
+  private static final java.lang.String privateNn;
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String nullableWithNN() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNotNullValWithGet();//  getNotNullValWithGet()
 
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String getNullableVal() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNotNullVarWithGetSet();//  getNotNullVarWithGetSet()
 
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String getNullableVar() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNullableValWithGet();//  getNullableValWithGet()
 
-    public static final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNullableVarWithGetSet();//  getNullableVarWithGetSet()
 
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String getNotNullVal() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String notNullWithN();//  notNullWithN()
 
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String getNotNullVar() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String nullableWithNN();//  nullableWithNN()
 
-    public static final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getNotNullVal();//  getNotNullVal()
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String getNotNullValWithGet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getNotNullVar();//  getNotNullVar()
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull() java.lang.String);//  notNull(java.lang.String)
 
-    @org.jetbrains.annotations.Nullable
-    public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String notNullWithNN();//  notNullWithNN()
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String getNullableValWithGet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable() java.lang.String);//  setNullableVarWithGetSet(java.lang.String)
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String getNullableVarWithGetSet() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNullableVal();//  getNullableVal()
 
-    @org.jetbrains.annotations.NotNull
-    public static final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNullableVar();//  getNullableVar()
+
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String nullable(@org.jetbrains.annotations.Nullable() java.lang.String);//  nullable(java.lang.String)
+
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String nullableWithN();//  nullableWithN()
+
+  @org.jetbrains.annotations.Nullable()
+  public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull() java.lang.String);//  setNotNullVarWithGetSet(java.lang.String)
+
+  private static final java.lang.String privateFun(java.lang.String, java.lang.String);//  privateFun(java.lang.String, java.lang.String)
+
+  public static final void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);//  setNotNullVar(java.lang.String)
+
+  public static final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);//  setNullableVar(java.lang.String)
 
-    private static final java.lang.String privateFun(java.lang.String a, java.lang.String b) { /* compiled code */ }
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java

@@ -1,12 +1,13 @@
-public interface Generic <N, NN> {
-    N a(N n);
+public abstract interface Generic /* Generic*/<N, NN>  {
+  @org.jetbrains.annotations.NotNull()
+  public abstract NN b(@org.jetbrains.annotations.NotNull() NN);//  b(NN)
 
-    @org.jetbrains.annotations.NotNull
-    NN b(@org.jetbrains.annotations.NotNull NN nn);
+  @org.jetbrains.annotations.Nullable()
+  public abstract N a1(@org.jetbrains.annotations.Nullable() N);//  a1(N)
 
-    @org.jetbrains.annotations.Nullable
-    N a1(@org.jetbrains.annotations.Nullable N n);
+  @org.jetbrains.annotations.Nullable()
+  public abstract NN b1(@org.jetbrains.annotations.Nullable() NN);//  b1(NN)
+
+  public abstract N a(N);//  a(N)
 
-    @org.jetbrains.annotations.Nullable
-    NN b1(@org.jetbrains.annotations.Nullable NN nn);
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java

@@ -1,11 +1,12 @@
-public final class C implements Tr {
-    private final int v;
+public final class C /* C*/ implements Tr {
+  private final int v;
 
-    @org.jetbrains.annotations.NotNull
-    public java.lang.Integer foo() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.Integer foo();//  foo()
 
-    @org.jetbrains.annotations.NotNull
-    public java.lang.Integer getV() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.Integer getV();//  getV()
+
+  public  C();//  .ctor()
 
-    public C() { /* compiled code */ }
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java

@@ -1,15 +1,16 @@
-public final class C {
-    @kotlin.jvm.JvmOverloads
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String o, @org.jetbrains.annotations.NotNull java.lang.String o1, @org.jetbrains.annotations.NotNull java.lang.String o3, @org.jetbrains.annotations.Nullable java.lang.String o4) { /* compiled code */ }
+public final class C /* C*/ {
+  @kotlin.jvm.JvmOverloads()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);//  foo(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 
-    @kotlin.jvm.JvmOverloads
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String o, @org.jetbrains.annotations.NotNull java.lang.String o1, @org.jetbrains.annotations.Nullable java.lang.String o4) { /* compiled code */ }
+  @kotlin.jvm.JvmOverloads()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);//  foo(java.lang.String, java.lang.String, java.lang.String)
 
-    @kotlin.jvm.JvmOverloads
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String o1, @org.jetbrains.annotations.Nullable java.lang.String o4) { /* compiled code */ }
+  @kotlin.jvm.JvmOverloads()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);//  foo(java.lang.String, java.lang.String)
+
+  public  C();//  .ctor()
 
-    public C() { /* compiled code */ }
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java

@@ -1,4 +1,5 @@
-public final class NullableUnitReturnKt {
-    @org.jetbrains.annotations.Nullable
-    public static final kotlin.Unit foo() { /* compiled code */ }
+public final class NullableUnitReturnKt /* NullableUnitReturnKt*/ {
+  @org.jetbrains.annotations.Nullable()
+  public static final kotlin.Unit foo();//  foo()
+
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java

@@ -1,5 +1,6 @@
-public final class C implements Base {
-    public void foo() { /* compiled code */ }
+public final class C /* C*/ implements Base {
+  public  C();//  .ctor()
+
+  public void foo();//  foo()
 
-    public C() { /* compiled code */ }
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.java

@@ -1,11 +1,12 @@
-public final class PlatformTypes {
-    public final java.lang.String simplyPlatform() { /* compiled code */ }
+public final class PlatformTypes /* PlatformTypes*/ {
+  @org.jetbrains.annotations.NotNull()
+  public final java.util.List<java.lang.String> bothNotNull();//  bothNotNull()
 
-    @org.jetbrains.annotations.Nullable
-    public final java.util.List<java.lang.String> bothNullable() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  public final java.util.List<java.lang.String> bothNullable();//  bothNullable()
 
-    @org.jetbrains.annotations.NotNull
-    public final java.util.List<java.lang.String> bothNotNull() { /* compiled code */ }
+  public  PlatformTypes();//  .ctor()
 
-    public PlatformTypes() { /* compiled code */ }
-}
+  public final java.lang.String simplyPlatform();//  simplyPlatform()
+
+}

compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java

@@ -1,43 +1,44 @@
-public interface Primitives {
-    int $$int /* Real name is 'int' */(int i);
+public abstract interface Primitives /* Primitives*/ {
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Boolean getNullableBool();//  getNullableBool()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Boolean getNullableBool();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Byte getNullableByte();//  getNullableByte()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Byte getNullableByte();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Character getNullableChar();//  getNullableChar()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Short getNullableShort();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Double getNullableDouble();//  getNullableDouble()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Character getNullableChar();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Float getNullableFloat();//  getNullableFloat()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Integer getNullableInt();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Integer getNullableInt();//  getNullableInt()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Long getNullableLong();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Long getNullableLong();//  getNullableLong()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Float getNullableFloat();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Short getNullableShort();//  getNullableShort()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Double getNullableDouble();
+  public abstract boolean getBool();//  getBool()
 
-    boolean getBool();
+  public abstract byte getByte();//  getByte()
 
-    byte getByte();
+  public abstract char getChar();//  getChar()
 
-    short getShort();
+  public abstract double getDouble();//  getDouble()
 
-    char getChar();
+  public abstract float getFloat();//  getFloat()
 
-    int getInt();
+  public abstract int getInt();//  getInt()
 
-    long getLong();
+  public abstract int int(int);//  int(int)
 
-    float getFloat();
+  public abstract long getLong();//  getLong()
+
+  public abstract short getShort();//  getShort()
 
-    double getDouble();
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java

@@ -1,11 +1,12 @@
-public final class PrivateInClass {
-    private final java.lang.String getNn() { /* compiled code */ }
+public final class PrivateInClass /* PrivateInClass*/ {
+  private  PrivateInClass(java.lang.String);//  .ctor(java.lang.String)
 
-    private final void setNn(java.lang.String value) { /* compiled code */ }
+  private final java.lang.String bar(java.lang.String, java.lang.String);//  bar(java.lang.String, java.lang.String)
 
-    private final java.lang.String getN() { /* compiled code */ }
+  private final java.lang.String getN();//  getN()
 
-    private final java.lang.String bar(java.lang.String a, java.lang.String b) { /* compiled code */ }
+  private final java.lang.String getNn();//  getNn()
 
-    private PrivateInClass(java.lang.String g) { /* compiled code */ }
-}
+  private final void setNn(java.lang.String);//  setNn(java.lang.String)
+
+}

compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.java

@@ -1,11 +1,12 @@
-public final class Synthetic {
-    private final void foo() { /* compiled code */ }
+public final class Synthetic /* Synthetic*/ {
+  private final void foo();//  foo()
 
-    public Synthetic() { /* compiled code */ }
+  public  Synthetic();//  .ctor()
 
-    public final class Inner {
-        public final void test() { /* compiled code */ }
 
-        public Inner() { /* compiled code */ }
-    }
-}
+public final class Inner /* Synthetic.Inner*/ {
+  public  Inner();//  .ctor()
+
+  public final void test();//  test()
+
+}}

compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java

@@ -1,37 +1,38 @@
-public interface Trait {
-    @org.jetbrains.annotations.NotNull
-    java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String p);
+public abstract interface Trait /* Trait*/ {
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String notNullWithN();//  notNullWithN()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String p);
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String nullableWithNN();//  nullableWithNN()
 
-    @org.jetbrains.annotations.NotNull
-    java.lang.String notNullWithNN();
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.lang.String getNotNullVal();//  getNotNullVal()
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    java.lang.String notNullWithN();
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.lang.String getNotNullVar();//  getNotNullVar()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.String nullableWithN();
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.lang.String notNull(@org.jetbrains.annotations.NotNull() java.lang.String);//  notNull(java.lang.String)
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    java.lang.String nullableWithNN();
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.lang.String notNullWithNN();//  notNullWithNN()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.String getNullableVal();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String getNullableVal();//  getNullableVal()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.String getNullableVar();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String getNullableVar();//  getNullableVar()
 
-    void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p);
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String nullable(@org.jetbrains.annotations.Nullable() java.lang.String);//  nullable(java.lang.String)
 
-    @org.jetbrains.annotations.NotNull
-    java.lang.String getNotNullVal();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String nullableWithN();//  nullableWithN()
 
-    @org.jetbrains.annotations.NotNull
-    java.lang.String getNotNullVar();
+  public abstract void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);//  setNotNullVar(java.lang.String)
+
+  public abstract void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);//  setNullableVar(java.lang.String)
 
-    void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p);
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt

@@ -10,7 +10,7 @@ interface Trait {
     @NotNull fun notNullWithNN(): String
     @Nullable fun notNullWithN(): String
 
-    @Nullable fun nullableWithN(): String?
+    @Nullable fun `nullableWithN`(): String?
     @NotNull fun nullableWithNN(): String?
 
     val nullableVal: String?

compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java

@@ -1,5 +1,6 @@
-public final class C implements Base<kotlin.Unit> {
-    public void foo(@org.jetbrains.annotations.NotNull kotlin.Unit t) { /* compiled code */ }
+public final class C /* C*/ implements Base<kotlin.Unit> {
+  public  C();//  .ctor()
+
+  public void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);//  foo(kotlin.Unit)
 
-    public C() { /* compiled code */ }
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java

@@ -1,3 +1,4 @@
-public final class UnitParameterKt {
-    public static final void foo(@org.jetbrains.annotations.NotNull kotlin.Unit s) { /* compiled code */ }
+public final class UnitParameterKt /* UnitParameterKt*/ {
+  public static final void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);//  foo(kotlin.Unit)
+
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java

@@ -1,3 +1,4 @@
-public final class VoidReturnKt {
-    public static final void foo(@org.jetbrains.annotations.NotNull java.lang.String g) { /* compiled code */ }
+public final class VoidReturnKt /* VoidReturnKt*/ {
+  public static final void foo(@org.jetbrains.annotations.NotNull() java.lang.String);//  foo(java.lang.String)
+
 }