[LC] fix PsiClassRenderer

analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt

@@ -103,11 +103,8 @@ abstract class AbstractSymbolLightClassesTestBase(
         testServices: TestServices,
         actual: String,
     ) {
-        if (currentResultPath().exists()) {
+        val path: Path = currentResultPath().takeIf { it.exists() } ?: javaPath()
-            testServices.assertions.assertEqualsToFile(currentResultPath(), actual)
+        testServices.assertions.assertEqualsToFile(path, actual)
-        } else {
-            testServices.assertions.assertEqualsToFile(javaPath(), actual)
-        }
     }
 
     private fun removeIgnoreFir(module: TestModule) {

compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.java

@@ -8,5 +8,4 @@ public enum AnnotatedParameterInEnumConstructor /* test.AnnotatedParameterInEnum
   public static test.AnnotatedParameterInEnumConstructor[] values();//  values()
 
   private  AnnotatedParameterInEnumConstructor(@test.Anno(x = "a") java.lang.String, @test.Anno(x = "b") java.lang.String);//  .ctor(java.lang.String, java.lang.String)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInInnerClassConstructor.java

@@ -1,12 +1,11 @@
 public final class AnnotatedParameterInInnerClassConstructor /* test.AnnotatedParameterInInnerClassConstructor*/ {
   public  AnnotatedParameterInInnerClassConstructor();//  .ctor()
 
+  public final class Inner /* test.AnnotatedParameterInInnerClassConstructor.Inner*/ {
+    public  Inner(@org.jetbrains.annotations.NotNull() @test.Anno(x = "a") java.lang.String, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);//  .ctor(java.lang.String, java.lang.String)
+  }
 
-
+  public final class InnerGeneric /* test.AnnotatedParameterInInnerClassConstructor.InnerGeneric*/<T>  {
-public final class Inner /* test.AnnotatedParameterInInnerClassConstructor.Inner*/ {
+    public  InnerGeneric(@test.Anno(x = "a") T, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);//  .ctor(T, java.lang.String)
-  public  Inner(@org.jetbrains.annotations.NotNull() @test.Anno(x = "a") java.lang.String, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);//  .ctor(java.lang.String, java.lang.String)
+  }
-
+}
-}public final class InnerGeneric /* test.AnnotatedParameterInInnerClassConstructor.InnerGeneric*/<T>  {
-  public  InnerGeneric(@test.Anno(x = "a") T, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);//  .ctor(T, java.lang.String)
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.fir.java

@@ -20,5 +20,4 @@ public final class Test /* Test*/ {
   public final void fooWithNullableReceiver(@MyAnnotation7() @org.jetbrains.annotations.Nullable() java.lang.Integer, long);//  fooWithNullableReceiver(java.lang.Integer, long)
 
   public final void setFooP(@MyAnnotation7() @org.jetbrains.annotations.NotNull() int, @org.jetbrains.annotations.NotNull() kotlin.Unit);//  setFooP(int, kotlin.Unit)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.java

@@ -20,5 +20,4 @@ public final class Test /* Test*/ {
   public final void fooWithNullableReceiver(@MyAnnotation7() @org.jetbrains.annotations.Nullable() java.lang.Integer, long);//  fooWithNullableReceiver(java.lang.Integer, long)
 
   public final void setFooP(@MyAnnotation7() int, @org.jetbrains.annotations.NotNull() kotlin.Unit);//  setFooP(int, kotlin.Unit)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.java

@@ -11,5 +11,4 @@ public abstract @interface Anno /* Anno*/ {
   public abstract int[] ia2() default {1, 2, 3};//  ia2()
 
   public abstract java.lang.String value() default "a";//  value()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJavaRepeatable.java

@@ -2,5 +2,4 @@
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface Two /* Two*/ {
   public abstract java.lang.String name();//  name()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJvmRepeatable.java

@@ -2,5 +2,4 @@
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface Two /* Two*/ {
   public abstract java.lang.String name();//  name()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJavaRepeatable.java

@@ -3,5 +3,4 @@
 @kotlin.annotation.Repeatable()
 public abstract @interface Two /* Two*/ {
   public abstract java.lang.String name();//  name()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJvmRepeatable.java

@@ -3,5 +3,4 @@
 @kotlin.annotation.Repeatable()
 public abstract @interface Two /* Two*/ {
   public abstract java.lang.String name();//  name()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.java

@@ -4,10 +4,9 @@
 public abstract @interface One /* simple.One*/ {
   public abstract java.lang.String value();//  value()
 
-
+  @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+  @kotlin.jvm.internal.RepeatableContainer()
-@kotlin.jvm.internal.RepeatableContainer()
+  public static abstract @interface Container /* simple.One.Container*/ {
-public static abstract @interface Container /* simple.One.Container*/ {
+    public abstract simple.One[] value();//  value()
-  public abstract simple.One[] value();//  value()
+  }
-
+}
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/Constructors.java

@@ -8,5 +8,4 @@ public final class Constructors /* Constructors*/ {
   public  Constructors(int);//  .ctor(int)
 
   public final int getValInPrimary();//  getValInPrimary()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.fir.java

@@ -1,76 +1,75 @@
 public final class Wrapper /* p.Wrapper*/ {
   public  Wrapper();//  .ctor()
 
+  public static final class Equals /* p.Wrapper.Equals*/ {
+    @org.jetbrains.annotations.NotNull()
+    private final p.G code;
 
+    @java.lang.Override()
+    public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
 
+    @org.jetbrains.annotations.NotNull()
+    public final p.G component1();//  component1()
 
-public static final class Equals /* p.Wrapper.Equals*/ {
+    @org.jetbrains.annotations.NotNull()
-  @org.jetbrains.annotations.NotNull()
+    public final p.G getCode();//  getCode()
-  private final p.G code;
 
-  @java.lang.Override()
+    @org.jetbrains.annotations.NotNull()
-  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
+    public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
 
-  @org.jetbrains.annotations.NotNull()
+    @org.jetbrains.annotations.NotNull()
-  public final p.G component1();//  component1()
+    public java.lang.String toString();//  toString()
 
-  @org.jetbrains.annotations.NotNull()
+    public  Equals(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
-  public final p.G getCode();//  getCode()
 
-  @org.jetbrains.annotations.NotNull()
+    public int hashCode();//  hashCode()
-  public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
+  }
 
-  @org.jetbrains.annotations.NotNull()
+  public static final class HashCode /* p.Wrapper.HashCode*/ {
-  public java.lang.String toString();//  toString()
+    @org.jetbrains.annotations.NotNull()
+    private final p.G code;
 
-  public  Equals(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
+    @java.lang.Override()
+    public int hashCode();//  hashCode()
 
-  public int hashCode();//  hashCode()
+    @org.jetbrains.annotations.NotNull()
+    public final p.G component1();//  component1()
 
-}public static final class HashCode /* p.Wrapper.HashCode*/ {
+    @org.jetbrains.annotations.NotNull()
-  @org.jetbrains.annotations.NotNull()
+    public final p.G getCode();//  getCode()
-  private final p.G code;
 
-  @java.lang.Override()
+    @org.jetbrains.annotations.NotNull()
-  public int hashCode();//  hashCode()
+    public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
 
-  @org.jetbrains.annotations.NotNull()
+    @org.jetbrains.annotations.NotNull()
-  public final p.G component1();//  component1()
+    public java.lang.String toString();//  toString()
 
-  @org.jetbrains.annotations.NotNull()
+    public  HashCode(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
-  public final p.G getCode();//  getCode()
 
-  @org.jetbrains.annotations.NotNull()
+    public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
-  public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
+  }
 
-  @org.jetbrains.annotations.NotNull()
+  public static final class ToString /* p.Wrapper.ToString*/ {
-  public java.lang.String toString();//  toString()
+    @org.jetbrains.annotations.NotNull()
+    private final p.G code;
 
-  public  HashCode(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
+    @java.lang.Override()
+    @org.jetbrains.annotations.NotNull()
+    public java.lang.String toString();//  toString()
 
-  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
+    @org.jetbrains.annotations.NotNull()
+    public final p.G component1();//  component1()
 
-}public static final class ToString /* p.Wrapper.ToString*/ {
+    @org.jetbrains.annotations.NotNull()
-  @org.jetbrains.annotations.NotNull()
+    public final p.G getCode();//  getCode()
-  private final p.G code;
 
-  @java.lang.Override()
+    @org.jetbrains.annotations.NotNull()
-  @org.jetbrains.annotations.NotNull()
+    public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
-  public java.lang.String toString();//  toString()
 
-  @org.jetbrains.annotations.NotNull()
+    public  ToString(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
-  public final p.G component1();//  component1()
 
-  @org.jetbrains.annotations.NotNull()
+    public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
-  public final p.G getCode();//  getCode()
 
-  @org.jetbrains.annotations.NotNull()
+    public int hashCode();//  hashCode()
-  public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
+  }
-
+}
-  public  ToString(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
-
-  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
-
-  public int hashCode();//  hashCode()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.java

@@ -1,73 +1,72 @@
 public final class Wrapper /* p.Wrapper*/ {
   public  Wrapper();//  .ctor()
 
+  public static final class Equals /* p.Wrapper.Equals*/ {
+    @org.jetbrains.annotations.NotNull()
+    private final p.G code;
 
+    @org.jetbrains.annotations.NotNull()
+    public final p.G component1();//  component1()
 
+    @org.jetbrains.annotations.NotNull()
+    public final p.G getCode();//  getCode()
 
-public static final class Equals /* p.Wrapper.Equals*/ {
+    @org.jetbrains.annotations.NotNull()
-  @org.jetbrains.annotations.NotNull()
+    public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
-  private final p.G code;
 
-  @org.jetbrains.annotations.NotNull()
+    @org.jetbrains.annotations.NotNull()
-  public final p.G component1();//  component1()
+    public java.lang.String toString();//  toString()
 
-  @org.jetbrains.annotations.NotNull()
+    public  Equals(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
-  public final p.G getCode();//  getCode()
 
-  @org.jetbrains.annotations.NotNull()
+    public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
-  public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
 
-  @org.jetbrains.annotations.NotNull()
+    public int hashCode();//  hashCode()
-  public java.lang.String toString();//  toString()
+  }
 
-  public  Equals(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
+  public static final class HashCode /* p.Wrapper.HashCode*/ {
+    @org.jetbrains.annotations.NotNull()
+    private final p.G code;
 
-  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
+    @org.jetbrains.annotations.NotNull()
+    public final p.G component1();//  component1()
 
-  public int hashCode();//  hashCode()
+    @org.jetbrains.annotations.NotNull()
+    public final p.G getCode();//  getCode()
 
-}public static final class HashCode /* p.Wrapper.HashCode*/ {
+    @org.jetbrains.annotations.NotNull()
-  @org.jetbrains.annotations.NotNull()
+    public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
-  private final p.G code;
 
-  @org.jetbrains.annotations.NotNull()
+    @org.jetbrains.annotations.NotNull()
-  public final p.G component1();//  component1()
+    public java.lang.String toString();//  toString()
 
-  @org.jetbrains.annotations.NotNull()
+    public  HashCode(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
-  public final p.G getCode();//  getCode()
 
-  @org.jetbrains.annotations.NotNull()
+    public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
-  public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
 
-  @org.jetbrains.annotations.NotNull()
+    public int hashCode();//  hashCode()
-  public java.lang.String toString();//  toString()
+  }
 
-  public  HashCode(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
+  public static final class ToString /* p.Wrapper.ToString*/ {
+    @org.jetbrains.annotations.NotNull()
+    private final p.G code;
 
-  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
+    @org.jetbrains.annotations.NotNull()
+    public final p.G component1();//  component1()
 
-  public int hashCode();//  hashCode()
+    @org.jetbrains.annotations.NotNull()
+    public final p.G getCode();//  getCode()
 
-}public static final class ToString /* p.Wrapper.ToString*/ {
+    @org.jetbrains.annotations.NotNull()
-  @org.jetbrains.annotations.NotNull()
+    public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
-  private final p.G code;
 
-  @org.jetbrains.annotations.NotNull()
+    @org.jetbrains.annotations.NotNull()
-  public final p.G component1();//  component1()
+    public java.lang.String toString();//  toString()
 
-  @org.jetbrains.annotations.NotNull()
+    public  ToString(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
-  public final p.G getCode();//  getCode()
 
-  @org.jetbrains.annotations.NotNull()
+    public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
-  public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
 
-  @org.jetbrains.annotations.NotNull()
+    public int hashCode();//  hashCode()
-  public java.lang.String toString();//  toString()
+  }
-
+}
-  public  ToString(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
-
-  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
-
-  public int hashCode();//  hashCode()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.fir.java

@@ -1,17 +1,16 @@
 public final class B /* p.B*/ {
   public  B();//  .ctor()
 
+  public static final class A /* p.B.A*/ implements p.I {
+    @org.jetbrains.annotations.NotNull()
+    private final p.I f;
 
-public static final class A /* p.B.A*/ implements p.I {
+    @java.lang.Override()
-  @org.jetbrains.annotations.NotNull()
+    public void f();//  f()
-  private final p.I f;
 
-  @java.lang.Override()
+    @java.lang.Override()
-  public void f();//  f()
+    public void g();//  g()
 
-  @java.lang.Override()
+    public  A(@org.jetbrains.annotations.NotNull() p.I);//  .ctor(p.I)
-  public void g();//  g()
+  }
-
+}
-  public  A(@org.jetbrains.annotations.NotNull() p.I);//  .ctor(p.I)
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.java

@@ -1,15 +1,14 @@
 public final class B /* p.B*/ {
   public  B();//  .ctor()
 
+  public static final class A /* p.B.A*/ implements p.I {
+    @org.jetbrains.annotations.NotNull()
+    private final p.I f;
 
-public static final class A /* p.B.A*/ implements p.I {
+    public  A(@org.jetbrains.annotations.NotNull() p.I);//  .ctor(p.I)
-  @org.jetbrains.annotations.NotNull()
-  private final p.I f;
 
-  public  A(@org.jetbrains.annotations.NotNull() p.I);//  .ctor(p.I)
+    public void f();//  f()
 
-  public void f();//  f()
+    public void g();//  g()
-
+  }
-  public void g();//  g()
+}
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.fir.java

@@ -9,5 +9,4 @@ public final class B /* p.B*/ implements p.I {
   public void g();//  g()
 
   public  B(@org.jetbrains.annotations.NotNull() p.I);//  .ctor(p.I)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.java

@@ -7,5 +7,4 @@ public final class B /* p.B*/ implements p.I {
   public void f();//  f()
 
   public void g();//  g()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.java

@@ -10,5 +10,4 @@ public enum E /* p.E*/ {
   public static p.E[] values();//  values()
 
   private  E();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedNotHiddenInClass.java

@@ -3,5 +3,4 @@ public final class A /* a.A*/ {
   public final void f();//  f()
 
   public  A();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInName.java

@@ -1,16 +1,15 @@
 public final class A$B /* c.b.a.A$B*/ {
   public  A$B();//  .ctor()
 
+  public final class C$D /* c.b.a.A$B.C$D*/ {
+    public  C$D();//  .ctor()
+  }
 
+  public static final class $$$$$$$ /* c.b.a.A$B.$$$$$$$*/ {
+    public  $$$$$$$();//  .ctor()
 
-public final class C$D /* c.b.a.A$B.C$D*/ {
+    public final class G$G$ /* c.b.a.A$B.$$$$$$$.G$G$*/ {
-  public  C$D();//  .ctor()
+      public  G$G$();//  .ctor()
-
+    }
-}public static final class $$$$$$$ /* c.b.a.A$B.$$$$$$$*/ {
+  }
-  public  $$$$$$$();//  .ctor()
+}
-
-
-public final class G$G$ /* c.b.a.A$B.$$$$$$$.G$G$*/ {
-  public  G$G$();//  .ctor()
-
-}}}

compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInNameNoPackage.java

@@ -1,16 +1,15 @@
 public final class A$B /* A$B*/ {
   public  A$B();//  .ctor()
 
+  public final class C$D /* A$B.C$D*/ {
+    public  C$D();//  .ctor()
+  }
 
+  public static final class $$$$$$$ /* A$B.$$$$$$$*/ {
+    public  $$$$$$$();//  .ctor()
 
-public final class C$D /* A$B.C$D*/ {
+    public final class G$G$ /* A$B.$$$$$$$.G$G$*/ {
-  public  C$D();//  .ctor()
+      public  G$G$();//  .ctor()
-
+    }
-}public static final class $$$$$$$ /* A$B.$$$$$$$*/ {
+  }
-  public  $$$$$$$();//  .ctor()
+}
-
-
-public final class G$G$ /* A$B.$$$$$$$.G$G$*/ {
-  public  G$G$();//  .ctor()
-
-}}}

compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.java

@@ -10,5 +10,4 @@ public enum MyEnumClass /* one.MyEnumClass*/ {
   private  MyEnumClass();//  .ctor()
 
   public final int foo();//  foo()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.java

@@ -13,5 +13,4 @@ public enum MyEnumClass /* one.MyEnumClass*/ {
   private  MyEnumClass();//  .ctor()
 
   public final int doo();//  doo()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.fir.java

@@ -13,5 +13,4 @@ static final class FirstEntry /* p.KotlinEnum.FirstEntry*/ extends p.KotlinEnum
   public final int getVariable();//  getVariable()
 
   public final void firstEntryFun();//  firstEntryFun()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.java

@@ -12,5 +12,4 @@ public static final class FirstEntry /* p.KotlinEnum.FirstEntry*/ extends p.Kotl
   public final void firstEntryFun();//  firstEntryFun()
 
   public void abstractFun();//  abstractFun()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.lib.java

@@ -12,5 +12,4 @@ static final class FirstEntry /* p.KotlinEnum.FirstEntry*/ extends p.KotlinEnum
   public final void firstEntryFun();//  firstEntryFun()
 
   public void abstractFun();//  abstractFun()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.fir.java

@@ -2,9 +2,8 @@ public abstract interface C /* p.C*/ extends p.B {
   @org.jetbrains.annotations.NotNull()
   public abstract java.lang.String c();//  c()
 
-
+  public static final class DefaultImpls /* p.C.DefaultImpls*/ {
-public static final class DefaultImpls /* p.C.DefaultImpls*/ {
+    @org.jetbrains.annotations.NotNull()
-  @org.jetbrains.annotations.NotNull()
+    public java.lang.String c();//  c()
-  public java.lang.String c();//  c()
+  }
-
+}
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.java

@@ -2,15 +2,14 @@ public abstract interface C /* p.C*/ extends p.B {
   @org.jetbrains.annotations.NotNull()
   public abstract java.lang.String c();//  c()
 
+  public static final class DefaultImpls /* p.C.DefaultImpls*/ {
+    @org.jetbrains.annotations.NotNull()
+    public static java.lang.String a(@org.jetbrains.annotations.NotNull() p.C);//  a(p.C)
 
-public static final class DefaultImpls /* p.C.DefaultImpls*/ {
+    @org.jetbrains.annotations.NotNull()
-  @org.jetbrains.annotations.NotNull()
+    public static java.lang.String b(@org.jetbrains.annotations.NotNull() p.C);//  b(p.C)
-  public static java.lang.String a(@org.jetbrains.annotations.NotNull() p.C);//  a(p.C)
 
-  @org.jetbrains.annotations.NotNull()
+    @org.jetbrains.annotations.NotNull()
-  public static java.lang.String b(@org.jetbrains.annotations.NotNull() p.C);//  b(p.C)
+    public static java.lang.String c(@org.jetbrains.annotations.NotNull() p.C);//  c(p.C)
-
+  }
-  @org.jetbrains.annotations.NotNull()
+}
-  public static java.lang.String c(@org.jetbrains.annotations.NotNull() p.C);//  c(p.C)
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecatedInClass.java

@@ -1,4 +1,3 @@
 public final class A /* a.A*/ {
   public  A();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.compiled.java

@@ -10,5 +10,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
   public final void f();//  f()
 
   public void g();//  g()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.fir.java

@@ -5,5 +5,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
   public  Inheritor();//  .ctor()
 
   public final void f();//  f()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.java

@@ -4,5 +4,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
   public final void f();//  f()
 
   public void g();//  g()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.lib.java

@@ -10,5 +10,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
   public final void f();//  f()
 
   public void g();//  g()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.java

@@ -1,4 +1,3 @@
 public final class InlineReified /* a.InlineReified*/ {
   public  InlineReified();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/JavaBetween.java

@@ -1,4 +1,3 @@
 public class AKotlin /* test.AKotlin*/ {
   public  AKotlin();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/JvmNameOnMember.java

@@ -6,5 +6,4 @@ public final class C /* C*/ {
   public final void myFun(@org.jetbrains.annotations.NotNull() C, @org.jetbrains.annotations.NotNull() C);//  myFun(C, C)
 
   public  C();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/JvmStatic.java

@@ -7,21 +7,20 @@ public final class A /* A*/ {
 
   public  A();//  .ctor()
 
+  public static final class B /* A.B*/ {
+    @org.jetbrains.annotations.NotNull()
+    public static final A.B INSTANCE;
 
+    @kotlin.jvm.JvmStatic()
+    public static final void g();//  g()
 
-public static final class B /* A.B*/ {
+    private  B();//  .ctor()
-  @org.jetbrains.annotations.NotNull()
+  }
-  public static final A.B INSTANCE;
 
-  @kotlin.jvm.JvmStatic()
+  public static final class Companion /* A.Companion*/ {
-  public static final void g();//  g()
+    @kotlin.jvm.JvmStatic()
+    public final void f();//  f()
 
-  private  B();//  .ctor()
+    private  Companion();//  .ctor()
-
+  }
-}public static final class Companion /* A.Companion*/ {
+}
-  @kotlin.jvm.JvmStatic()
-  public final void f();//  f()
-
-  private  Companion();//  .ctor()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.java

@@ -4,5 +4,4 @@ public final class A /* p.A*/ {
   public final int getProperty();//  getProperty()
 
   public final void memberFun();//  memberFun()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.lib.java

@@ -12,5 +12,4 @@ public final class A /* p.A*/ {
   public final int getProperty();//  getProperty()
 
   public final void memberFun();//  memberFun()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/NestedObjects.java

@@ -1,43 +1,42 @@
 public final class A /* A*/ {
   public  A();//  .ctor()
 
+  public static final class B /* A.B*/ {
+    public  B();//  .ctor()
 
+    public static final class I /* A.B.I*/ {
+      @org.jetbrains.annotations.NotNull()
+      public static final A.B.I INSTANCE;
 
-public static final class B /* A.B*/ {
+      private  I();//  .ctor()
-  public  B();//  .ctor()
+    }
 
+    public static final class II /* A.B.II*/ {
+      @org.jetbrains.annotations.NotNull()
+      public static final A.B.II INSTANCE;
 
+      private  II();//  .ctor()
+    }
+  }
 
-public static final class I /* A.B.I*/ {
+  public static final class C /* A.C*/ {
-  @org.jetbrains.annotations.NotNull()
+    @org.jetbrains.annotations.NotNull()
-  public static final A.B.I INSTANCE;
+    public static final A.C INSTANCE;
 
-  private  I();//  .ctor()
+    private  C();//  .ctor()
 
-}public static final class II /* A.B.II*/ {
+    public static final class D /* A.C.D*/ {
-  @org.jetbrains.annotations.NotNull()
+      @org.jetbrains.annotations.NotNull()
-  public static final A.B.II INSTANCE;
+      public static final A.C.D INSTANCE;
 
-  private  II();//  .ctor()
+      private  D();//  .ctor()
 
-}}public static final class C /* A.C*/ {
+      public static final class G /* A.C.D.G*/ {
-  @org.jetbrains.annotations.NotNull()
+        @org.jetbrains.annotations.NotNull()
-  public static final A.C INSTANCE;
+        public static final A.C.D.G INSTANCE;
 
-  private  C();//  .ctor()
+        private  G();//  .ctor()
-
+      }
-
+    }
-public static final class D /* A.C.D*/ {
+  }
-  @org.jetbrains.annotations.NotNull()
+}
-  public static final A.C.D INSTANCE;
-
-  private  D();//  .ctor()
-
-
-public static final class G /* A.C.D.G*/ {
-  @org.jetbrains.annotations.NotNull()
-  public static final A.C.D.G INSTANCE;
-
-  private  G();//  .ctor()
-
-}}}}

compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.fir.java

@@ -16,5 +16,4 @@ public final class A /* p.A*/ {
   public final int component1();//  component1()
 
   public final int getY();//  getY()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.java

@@ -13,5 +13,4 @@ public final class A /* p.A*/ {
   public final int getY();//  getY()
 
   public int hashCode();//  hashCode()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/OnlySecondaryConstructors.java

@@ -2,5 +2,4 @@ public final class OnlySecondaryConstructors /* OnlySecondaryConstructors*/ {
   public  OnlySecondaryConstructors();//  .ctor()
 
   public  OnlySecondaryConstructors(int);//  .ctor(int)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.java

@@ -5,5 +5,4 @@ public final class A /* A*/ {
   public  A();//  .ctor()
 
   public final void test();//  test()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/SpecialAnnotationsOnAnnotationClass.java

@@ -9,13 +9,12 @@
 public abstract @interface Anno /* Anno*/ {
   public abstract int i();//  i()
 
-
+  @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
+  @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE_PARAMETER, java.lang.annotation.ElementType.TYPE_USE})
-@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE_PARAMETER, java.lang.annotation.ElementType.TYPE_USE})
+  @kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
-@kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
+  @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.TYPE_PARAMETER, kotlin.annotation.AnnotationTarget.TYPE})
-@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.TYPE_PARAMETER, kotlin.annotation.AnnotationTarget.TYPE})
+  @kotlin.jvm.internal.RepeatableContainer()
-@kotlin.jvm.internal.RepeatableContainer()
+  public static abstract @interface Container /* Anno.Container*/ {
-public static abstract @interface Container /* Anno.Container*/ {
+    public abstract Anno[] value();//  value()
-  public abstract Anno[] value();//  value()
+  }
-
+}
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.java

@@ -4,5 +4,4 @@ public final class A /* A*/ {
   public final void foo(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function4<? super RS, ? super P, ? super P, ? super kotlin.coroutines.Continuation<? super kotlin.Unit>, ? extends java.lang.Object>);//  foo(kotlin.jvm.functions.Function4<? super RS, ? super P, ? super P, ? super kotlin.coroutines.Continuation<? super kotlin.Unit>, ? extends java.lang.Object>)
 
   public final void foo(@org.jetbrains.annotations.Nullable() P, @org.jetbrains.annotations.Nullable() P);//  foo(P, P)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.java

@@ -1,12 +1,11 @@
 public abstract class A /* A*/<T extends A<T>>  extends B<java.util.Collection<? extends T>> implements C<T> {
   public  A();//  .ctor()
 
+  public class Inner /* A.Inner*/<D>  extends B<java.util.Collection<? extends T>> implements C<D> {
+    public  Inner();//  .ctor()
+  }
 
-
+  public final class Inner2 /* A.Inner2*/<X>  extends A.Inner<X> implements C<X> {
-public class Inner /* A.Inner*/<D>  extends B<java.util.Collection<? extends T>> implements C<D> {
+    public  Inner2();//  .ctor()
-  public  Inner();//  .ctor()
+  }
-
+}
-}public final class Inner2 /* A.Inner2*/<X>  extends A.Inner<X> implements C<X> {
-  public  Inner2();//  .ctor()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/VarArgs.java

@@ -4,5 +4,4 @@ public final class C /* C*/ {
   public final /* vararg */ void f(@org.jetbrains.annotations.NotNull() int...);//  f(int[])
 
   public final /* vararg */ void p(int, @org.jetbrains.annotations.NotNull() java.lang.String...);//  p(int, java.lang.String[])
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualClass.java

@@ -1,4 +1,3 @@
 public final class B /* p.B*/ {
   public  B();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.fir.java

@@ -14,5 +14,4 @@ public final class A /* A*/ {
   public  A();//  .ctor()
 
   public final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);//  setC(java.lang.String)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.java

@@ -14,5 +14,4 @@ public final class A /* A*/ {
   public  A();//  .ctor()
 
   public final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);//  setC(java.lang.String)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.java

@@ -8,5 +8,4 @@ public enum EnumNameOverride /* EnumNameOverride*/ implements Bar {
   public static EnumNameOverride[] values();//  values()
 
   private  EnumNameOverride();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.fir.java

@@ -1,5 +1,4 @@
 public abstract interface Foo /* test.Foo*/ {
   @org.jetbrains.annotations.NotNull()
   public abstract java.lang.String foo();//  foo()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.java

@@ -3,5 +3,4 @@ public abstract interface Foo /* test.Foo*/ {
   public abstract java.lang.String foo();//  foo()
 
   public abstract int <no name provided>();//  <no name provided>()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/JvmPackageName.java

@@ -1,5 +1,4 @@
 @kotlin.jvm.JvmPackageName(name = "a.b.c")
 public final class JvmPackageNameKt /* a.b.c.JvmPackageNameKt*/ {
   public static final void f();//  f()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.fir.java

@@ -5,12 +5,11 @@ public abstract interface PrivateInTrait /* PrivateInTrait*/ {
 
   private abstract void setNn(java.lang.String);//  setNn(java.lang.String)
 
+  public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ {
+    private final java.lang.String getN();//  getN()
 
-public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ {
+    private final java.lang.String getNn();//  getNn()
-  private final java.lang.String getN();//  getN()
 
-  private final java.lang.String getNn();//  getNn()
+    private final void setNn(java.lang.String);//  setNn(java.lang.String)
-
+  }
-  private final void setNn(java.lang.String);//  setNn(java.lang.String)
+}
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.java

@@ -1,10 +1,9 @@
 public abstract interface PrivateInTrait /* PrivateInTrait*/ {
+  public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ {
+    private static java.lang.String getN(@org.jetbrains.annotations.NotNull() PrivateInTrait);//  getN(PrivateInTrait)
 
-public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ {
+    private static java.lang.String getNn(@org.jetbrains.annotations.NotNull() PrivateInTrait);//  getNn(PrivateInTrait)
-  private static java.lang.String getN(@org.jetbrains.annotations.NotNull() PrivateInTrait);//  getN(PrivateInTrait)
 
-  private static java.lang.String getNn(@org.jetbrains.annotations.NotNull() PrivateInTrait);//  getNn(PrivateInTrait)
+    private static void setNn(@org.jetbrains.annotations.NotNull() PrivateInTrait, java.lang.String);//  setNn(PrivateInTrait, java.lang.String)
-
+  }
-  private static void setNn(@org.jetbrains.annotations.NotNull() PrivateInTrait, java.lang.String);//  setNn(PrivateInTrait, java.lang.String)
+}
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PropertyWithoutName.java

@@ -1,5 +1,4 @@
 public abstract interface Foo /* test.Foo*/ {
   @org.jetbrains.annotations.NotNull()
   public abstract java.lang.String getFoo();//  getFoo()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/RepetableAnnotations.java

@@ -15,5 +15,4 @@ public final class Annotations /* p.Annotations*/ {
   public final void repeatables2();//  repeatables2()
 
   public  Annotations();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/SameName.java

@@ -20,5 +20,4 @@ public final class A /* A*/ {
   public final void f(int, double);//  f(int, double)
 
   public final void f(int, double);//  f(int, double)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.java

@@ -2,5 +2,4 @@ public final class TopLevelDestructuringKt /* TopLevelDestructuringKt*/ {
   private static final int z;
 
   public static final int getZ();//  getZ()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TraitClassObjectField.java

@@ -5,14 +5,13 @@ public abstract interface TraitClassObjectField /* TraitClassObjectField*/ {
   @org.jetbrains.annotations.Nullable()
   public static final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value  */;
 
+  public static final class Companion /* TraitClassObjectField.Companion*/ {
+    @org.jetbrains.annotations.Nullable()
+    private static final java.lang.String y;
 
-public static final class Companion /* TraitClassObjectField.Companion*/ {
+    @org.jetbrains.annotations.Nullable()
-  @org.jetbrains.annotations.Nullable()
+    public static final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value  */;
-  private static final java.lang.String y;
 
-  @org.jetbrains.annotations.Nullable()
+    private  Companion();//  .ctor()
-  public static final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value  */;
+  }
-
+}
-  private  Companion();//  .ctor()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.fir.java

@@ -8,5 +8,4 @@ public final class TwoOverrides /* TwoOverrides*/ implements java.lang.Iterable<
   public java.lang.Void iterator();//  iterator()
 
   public  TwoOverrides();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.java

@@ -6,5 +6,4 @@ public final class TwoOverrides /* TwoOverrides*/ implements java.lang.Iterable<
   public java.lang.Void iterator();//  iterator()
 
   public  TwoOverrides();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.fir.java

@@ -7,26 +7,25 @@ public final class A /* A*/ {
 
   public  A();//  .ctor()
 
+  public static final class Companion /* A.Companion*/ {
+    @kotlin.jvm.JvmName()
+    public final void f4();//  f4()
 
-public static final class Companion /* A.Companion*/ {
+    @kotlin.jvm.JvmName(name = "realName")
-  @kotlin.jvm.JvmName()
+    public final void realName();//  realName()
-  public final void f4();//  f4()
 
-  @kotlin.jvm.JvmName(name = "realName")
+    @kotlin.jvm.JvmName(name = 1L)
-  public final void realName();//  realName()
+    public final void f2();//  f2()
 
-  @kotlin.jvm.JvmName(name = 1L)
+    @kotlin.jvm.JvmOverloads()
-  public final void f2();//  f2()
+    public final void f5();//  f5()
 
-  @kotlin.jvm.JvmOverloads()
+    @kotlin.jvm.JvmOverloads()
-  public final void f5();//  f5()
+    public final void f6();//  f6()
 
-  @kotlin.jvm.JvmOverloads()
+    @kotlin.jvm.JvmStatic()
-  public final void f6();//  f6()
+    public final void f3();//  f3()
 
-  @kotlin.jvm.JvmStatic()
+    private  Companion();//  .ctor()
-  public final void f3();//  f3()
+  }
-
+}
-  private  Companion();//  .ctor()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.java

@@ -7,26 +7,25 @@ public final class A /* A*/ {
 
   public  A();//  .ctor()
 
+  public static final class Companion /* A.Companion*/ {
+    @kotlin.jvm.JvmName()
+    public final void f4();//  f4()
 
-public static final class Companion /* A.Companion*/ {
+    @kotlin.jvm.JvmName(name = "realName")
-  @kotlin.jvm.JvmName()
+    public final void realName();//  realName()
-  public final void f4();//  f4()
 
-  @kotlin.jvm.JvmName(name = "realName")
+    @kotlin.jvm.JvmName(name = 1)
-  public final void realName();//  realName()
+    public final void f2();//  f2()
 
-  @kotlin.jvm.JvmName(name = 1)
+    @kotlin.jvm.JvmOverloads()
-  public final void f2();//  f2()
+    public final void f5();//  f5()
 
-  @kotlin.jvm.JvmOverloads()
+    @kotlin.jvm.JvmOverloads()
-  public final void f5();//  f5()
+    public final void f6();//  f6()
 
-  @kotlin.jvm.JvmOverloads()
+    @kotlin.jvm.JvmStatic()
-  public final void f6();//  f6()
+    public final void f3();//  f3()
 
-  @kotlin.jvm.JvmStatic()
+    private  Companion();//  .ctor()
-  public final void f3();//  f3()
+  }
-
+}
-  private  Companion();//  .ctor()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.fir.java

@@ -4,5 +4,4 @@ public final class Derived /* Derived*/ implements Base {
   public java.lang.String baz(@org.jetbrains.annotations.NotNull() java.lang.String);//  baz(java.lang.String)
 
   public  Derived(@org.jetbrains.annotations.NotNull() Base);//  .ctor(Base)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.java

@@ -3,5 +3,4 @@ public final class Derived /* Derived*/ implements Base {
   public java.lang.String baz(@org.jetbrains.annotations.NotNull() java.lang.String);//  baz(java.lang.String)
 
   public  Derived(@org.jetbrains.annotations.NotNull() Base);//  .ctor(Base)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.fir.java

@@ -1,4 +1,3 @@
 public final class Derived /* Derived*/ implements Base {
   public  Derived(@org.jetbrains.annotations.NotNull() Base);//  .ctor(Base)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.java

@@ -3,5 +3,4 @@ public final class Derived /* Derived*/ implements Base {
   public java.lang.String getBoo();//  getBoo()
 
   public  Derived(@org.jetbrains.annotations.NotNull() Base);//  .ctor(Base)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/facades/MultiFile.java

@@ -1,4 +1,3 @@
 public final class MultiFile /* test.MultiFile*/ {
   public static final int getFoo();//  getFoo()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleFile.java

@@ -1,4 +1,3 @@
 public final class SingleFileKt /* SingleFileKt*/ {
   public static final void foo();//  foo()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.java

@@ -1,5 +1,4 @@
 @kotlin.jvm.JvmName(name = "NewName")
 public final class NewName /* NewName*/ {
   public static final void foo();//  foo()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.fir.java

@@ -10,17 +10,16 @@ public final class C /* test.C*/ {
 
   public final void g();//  g()
 
+  @test.AllOpen()
+  public static final class H /* test.C.H*/ {
+    public  H();//  .ctor()
 
+    public final void j();//  j()
+  }
 
-@test.AllOpen()
+  public static final class D /* test.C.D*/ {
-public static final class H /* test.C.H*/ {
+    public  D();//  .ctor()
-  public  H();//  .ctor()
 
-  public final void j();//  j()
+    public final void z();//  z()
-
+  }
-}public static final class D /* test.C.D*/ {
+}
-  public  D();//  .ctor()
-
-  public final void z();//  z()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.java

@@ -10,17 +10,16 @@ public class C /* test.C*/ {
 
   public void g();//  g()
 
+  @test.AllOpen()
+  public static class H /* test.C.H*/ {
+    public  H();//  .ctor()
 
+    public void j();//  j()
+  }
 
-@test.AllOpen()
+  public static final class D /* test.C.D*/ {
-public static class H /* test.C.H*/ {
+    public  D();//  .ctor()
-  public  H();//  .ctor()
 
-  public void j();//  j()
+    public final void z();//  z()
-
+  }
-}public static final class D /* test.C.D*/ {
+}
-  public  D();//  .ctor()
-
-  public final void z();//  z()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.fir.java

@@ -1,46 +1,45 @@
 public final class Container /* p1.Container*/ {
   public  Container();//  .ctor()
 
+  public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number {
+    @java.lang.Override()
+    public byte toByte();//  toByte()
 
+    @java.lang.Override()
+    public char toChar();//  toChar()
 
-public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number {
+    @java.lang.Override()
-  @java.lang.Override()
+    public double toDouble();//  toDouble()
-  public byte toByte();//  toByte()
 
-  @java.lang.Override()
+    @java.lang.Override()
-  public char toChar();//  toChar()
+    public float toFloat();//  toFloat()
 
-  @java.lang.Override()
+    @java.lang.Override()
-  public double toDouble();//  toDouble()
+    public int toInt();//  toInt()
 
-  @java.lang.Override()
+    @java.lang.Override()
-  public float toFloat();//  toFloat()
+    public long toLong();//  toLong()
 
-  @java.lang.Override()
+    @java.lang.Override()
-  public int toInt();//  toInt()
+    public short toShort();//  toShort()
 
-  @java.lang.Override()
+    public  MyNumber();//  .ctor()
-  public long toLong();//  toLong()
+  }
 
-  @java.lang.Override()
+  public static final class MyString /* p1.Container.MyString*/ implements java.lang.CharSequence {
-  public short toShort();//  toShort()
+    @java.lang.Override()
+    @org.jetbrains.annotations.NotNull()
+    public java.lang.CharSequence subSequence(int, int);//  subSequence(int, int)
 
-  public  MyNumber();//  .ctor()
+    @java.lang.Override()
+    public char get(int);//  get(int)
 
-}public static final class MyString /* p1.Container.MyString*/ implements java.lang.CharSequence {
+    public  MyString();//  .ctor()
-  @java.lang.Override()
-  @org.jetbrains.annotations.NotNull()
-  public java.lang.CharSequence subSequence(int, int);//  subSequence(int, int)
 
-  @java.lang.Override()
+    public error.NonExistentClass chars();//  chars()
-  public char get(int);//  get(int)
 
-  public  MyString();//  .ctor()
+    public error.NonExistentClass codePoints();//  codePoints()
 
-  public error.NonExistentClass chars();//  chars()
+    public int getLength();//  getLength()
-
+  }
-  public error.NonExistentClass codePoints();//  codePoints()
+}
-
-  public int getLength();//  getLength()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.java

@@ -1,38 +1,36 @@
 public final class Container /* p1.Container*/ {
   public  Container();//  .ctor()
 
+  public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number {
+    public  MyNumber();//  .ctor()
 
+    public byte toByte();//  toByte()
 
-public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number {
+    public char toChar();//  toChar()
-  public  MyNumber();//  .ctor()
 
-  public byte toByte();//  toByte()
+    public double toDouble();//  toDouble()
 
-  public char toChar();//  toChar()
+    public float toFloat();//  toFloat()
 
-  public double toDouble();//  toDouble()
+    public int toInt();//  toInt()
 
-  public float toFloat();//  toFloat()
+    public long toLong();//  toLong()
 
-  public int toInt();//  toInt()
+    public short toShort();//  toShort()
+  }
 
-  public long toLong();//  toLong()
+  public static final class MyString /* p1.Container.MyString*/ implements java.lang.CharSequence {
+    @org.jetbrains.annotations.NotNull()
+    public java.lang.CharSequence subSequence(int, int);//  subSequence(int, int)
 
-  public short toShort();//  toShort()
+    public  MyString();//  .ctor()
 
-}public static final class MyString /* p1.Container.MyString*/ implements java.lang.CharSequence {
+    public char get(int);//  get(int)
-  @org.jetbrains.annotations.NotNull()
-  public java.lang.CharSequence subSequence(int, int);//  subSequence(int, int)
 
-  public  MyString();//  .ctor()
+    public error.NonExistentClass chars();//  chars()
 
-  public char get(int);//  get(int)
+    public error.NonExistentClass codePoints();//  codePoints()
-
-  public error.NonExistentClass chars();//  chars()
-
-  public error.NonExistentClass codePoints();//  codePoints()
-
-  public int getLength();//  getLength()
-
-}}
 
+    public int getLength();//  getLength()
+  }
+}

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.fir.java

@@ -3,5 +3,4 @@ public final class TypeHierarchyMap /* p1.TypeHierarchyMap*/<TValue>  implements
   public boolean containsKey(@org.jetbrains.annotations.NotNull() java.lang.Class<?>);//  containsKey(java.lang.Class<?>)
 
   public  TypeHierarchyMap();//  .ctor()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.java

@@ -2,5 +2,4 @@ public final class TypeHierarchyMap /* p1.TypeHierarchyMap*/<TValue>  implements
   public  TypeHierarchyMap();//  .ctor()
 
   public boolean containsKey(@org.jetbrains.annotations.NotNull() java.lang.Class<?>);//  containsKey(java.lang.Class<?>)
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.fir.java

@@ -33,16 +33,15 @@ public final class SmartSet /* SmartSet*/<T>  extends kotlin.collections.Abstrac
 
   public void setSize(int);//  setSize(int)
 
+  public static final class Companion /* SmartSet.Companion*/ {
+    @kotlin.jvm.JvmStatic()
+    @org.jetbrains.annotations.NotNull()
+    public final <T> SmartSet<T> create();// <T>  create()
 
-public static final class Companion /* SmartSet.Companion*/ {
+    @kotlin.jvm.JvmStatic()
-  @kotlin.jvm.JvmStatic()
+    @org.jetbrains.annotations.NotNull()
-  @org.jetbrains.annotations.NotNull()
+    public final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull() java.util.Collection<? extends T>);// <T>  create(java.util.Collection<? extends T>)
-  public final <T> SmartSet<T> create();// <T>  create()
 
-  @kotlin.jvm.JvmStatic()
+    private  Companion();//  .ctor()
-  @org.jetbrains.annotations.NotNull()
+  }
-  public final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull() java.util.Collection<? extends T>);// <T>  create(java.util.Collection<? extends T>)
+}
-
-  private  Companion();//  .ctor()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.java

@@ -30,16 +30,15 @@ public final class SmartSet /* SmartSet*/<T>  extends kotlin.collections.Abstrac
 
   public void setSize(int);//  setSize(int)
 
+  public static final class Companion /* SmartSet.Companion*/ {
+    @kotlin.jvm.JvmStatic()
+    @org.jetbrains.annotations.NotNull()
+    public final <T> SmartSet<T> create();// <T>  create()
 
-public static final class Companion /* SmartSet.Companion*/ {
+    @kotlin.jvm.JvmStatic()
-  @kotlin.jvm.JvmStatic()
+    @org.jetbrains.annotations.NotNull()
-  @org.jetbrains.annotations.NotNull()
+    public final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull() java.util.Collection<? extends T>);// <T>  create(java.util.Collection<? extends T>)
-  public final <T> SmartSet<T> create();// <T>  create()
 
-  @kotlin.jvm.JvmStatic()
+    private  Companion();//  .ctor()
-  @org.jetbrains.annotations.NotNull()
+  }
-  public final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull() java.util.Collection<? extends T>);// <T>  create(java.util.Collection<? extends T>)
+}
-
-  private  Companion();//  .ctor()
-
-}}

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.fir.java

@@ -5,5 +5,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
   public  Inheritor();//  .ctor()
 
   public final void f();//  f()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.java

@@ -4,5 +4,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
   public final void f();//  f()
 
   public void g();//  g()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.lib.java

@@ -12,5 +12,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
   public final void f();//  f()
 
   public void g();//  g()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.fir.java

@@ -4,5 +4,4 @@ public final class C /* p.C*/ {
   public int af();//  af()
 
   public int getAp();//  getAp()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.java

@@ -4,5 +4,4 @@ public final class C /* p.C*/ extends p.A {
   public int af$light_idea_test_case();//  af$light_idea_test_case()
 
   public int getAp$light_idea_test_case();//  getAp$light_idea_test_case()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.fir.java

@@ -8,5 +8,4 @@ public final class C /* p.C*/ {
   public int getAp();//  getAp()
 
   public int getIp();//  getIp()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.java

@@ -10,5 +10,4 @@ public final class C /* p.C*/ extends p.A implements p.I {
   public int getAp$light_idea_test_case();//  getAp$light_idea_test_case()
 
   public int getIp$light_idea_test_case();//  getIp$light_idea_test_case()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.fir.java

@@ -4,5 +4,4 @@ public final class C /* p.C*/ {
   public int af();//  af()
 
   public int getAp();//  getAp()
-
 }

compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.java

@@ -4,5 +4,4 @@ public final class C /* p.C*/ extends p.A {
   protected int getAp();//  getAp()
 
   public  C();//  .ctor()
-
 }

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

@@ -83,5 +83,4 @@ public final class Class /* Class*/ {
   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)
-
 }

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

@@ -10,11 +10,10 @@ public final class ClassObjectField /* ClassObjectField*/ {
 
   public  ClassObjectField();//  .ctor()
 
+  public static final class Companion /* ClassObjectField.Companion*/ {
+    @org.jetbrains.annotations.Nullable()
+    public final java.lang.String getX();//  getX()
 
-public static final class Companion /* ClassObjectField.Companion*/ {
+    private  Companion();//  .ctor()
-  @org.jetbrains.annotations.Nullable()
+  }
-  public final java.lang.String getX();//  getX()
+}
-
-  private  Companion();//  .ctor()
-
-}}

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

@@ -1,4 +1,3 @@
 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/lightClassByFqName/nullabilityAnnotations/ClassWithConstructorAndProperties.java

@@ -12,5 +12,4 @@ public final class ClassWithConstructorAndProperties /* ClassWithConstructorAndP
   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)
-
 }

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

@@ -76,5 +76,4 @@ public final class FileFacadeKt /* FileFacadeKt*/ {
   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)
-
 }

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

@@ -9,5 +9,4 @@ public abstract interface Generic /* Generic*/<N, NN>  {
   public abstract NN b1(@org.jetbrains.annotations.Nullable() NN);//  b1(NN)
 
   public abstract N a(N);//  a(N)
-
 }

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

@@ -7,5 +7,4 @@ public final class C /* C*/ implements Tr {
   public  C();//  .ctor()
 
   public int getV();//  getV()
-
 }

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

@@ -8,5 +8,4 @@ public final class C /* C*/ implements Tr {
   public java.lang.Integer getV();//  getV()
 
   public  C();//  .ctor()
-
 }

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

@@ -12,5 +12,4 @@ public final class C /* C*/ {
   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()
-
 }