[LC] render all type annotations in tests

^KT-66603

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.asJava.LightClassTestCommon
 import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
 import org.jetbrains.kotlin.asJava.renderClass
 import org.jetbrains.kotlin.light.classes.symbol.base.service.getLightClassesFromFile
-import org.jetbrains.kotlin.light.classes.symbol.base.service.withExtendedTypeRenderer
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.isValidJavaFqName
 import org.jetbrains.kotlin.psi.KtFile
@@ -55,8 +54,10 @@ abstract class AbstractSymbolLightClassesByPsiTest(
             TestCase.assertEquals(lc, lcViaFinder)
         }
 
-        return withExtendedTypeRenderer(testDataFile) {
+        return lightClasses.sortedBy {
-            lightClasses.sortedBy { it.qualifiedName ?: it.name.toString() }.joinToString("\n\n") { it.renderClass() }
+            it.qualifiedName ?: it.name.toString()
+        }.joinToString("\n\n") {
+            it.renderClass()
         }
     }
 }

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

@@ -7,22 +7,10 @@ package org.jetbrains.kotlin.light.classes.symbol.base.service
 
 import com.intellij.psi.PsiClass
 import com.intellij.psi.SyntaxTraverser
-import org.jetbrains.kotlin.asJava.PsiClassRenderer
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.asJava.toLightElements
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
-import java.nio.file.Path
-
-internal inline fun <R> withExtendedTypeRenderer(testDataFile: Path, action: () -> R): R {
-    val extendedTypeRendererOld = PsiClassRenderer.extendedTypeRenderer.get()
-    return try {
-        PsiClassRenderer.extendedTypeRenderer.set(testDataFile.toString().endsWith("typeAnnotations.kt"))
-        action()
-    } finally {
-        PsiClassRenderer.extendedTypeRenderer.set(extendedTypeRendererOld)
-    }
-}
 
 internal fun getLightClassesFromFile(ktFile: KtFile): List<PsiClass> {
     val ktClasses = SyntaxTraverser.psiTraverser(ktFile).filter(KtClassOrObject::class.java).toList()

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

@@ -0,0 +1,14 @@
+public enum AnnotatedParameterInEnumConstructor /* test.AnnotatedParameterInEnumConstructor*/ {
+  A;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() test.AnnotatedParameterInEnumConstructor[] values();//  values()
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<test.AnnotatedParameterInEnumConstructor> getEntries();//  getEntries()
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() test.AnnotatedParameterInEnumConstructor valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  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/AnnotatedParameterInEnumConstructor.lib.java

@@ -0,0 +1,14 @@
+public enum AnnotatedParameterInEnumConstructor /* test.AnnotatedParameterInEnumConstructor*/ {
+  A;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<test.AnnotatedParameterInEnumConstructor> getEntries();//  getEntries()
+
+  @org.jetbrains.annotations.NotNull()
+  public static test.AnnotatedParameterInEnumConstructor valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  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/AnnotatedPropertyWithSites.descriptors.java

@@ -0,0 +1,23 @@
+public final class Test /* Test*/ {
+  @MyAnnotation5()
+  @org.jetbrains.annotations.NotNull()
+  private java.lang.String bar;
+
+  @MyAnnotation()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getBar();//  getBar()
+
+  @MyAnnotation2()
+  public final void setBar(@MyAnnotation3() @org.jetbrains.annotations.NotNull() java.lang.String);//  setBar(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public final kotlin.Unit getFooP(@MyAnnotation7() @MyAnnotation8() int);//  getFooP(@MyAnnotation8() int)
+
+  public  Test(@MyAnnotation6() @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
+
+  public final void fooF(@MyAnnotation7() @MyAnnotation8() int);//  fooF(@MyAnnotation8() int)
+
+  public final void fooWithNullableReceiver(@MyAnnotation7() @org.jetbrains.annotations.Nullable() @MyAnnotation8() java.lang.Integer, long);//  fooWithNullableReceiver(@MyAnnotation8() java.lang.Integer, long)
+
+  public final void setFooP(@MyAnnotation7() @MyAnnotation8() int, @org.jetbrains.annotations.NotNull() kotlin.Unit);//  setFooP(@MyAnnotation8() int, kotlin.Unit)
+}

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

@@ -10,14 +10,18 @@ public final class Test /* Test*/ {
   @MyAnnotation2()
   public final void setBar(@MyAnnotation3() @org.jetbrains.annotations.NotNull() java.lang.String);//  setBar(java.lang.String)
 
+  @MyAnnotation4()
+  @java.lang.Deprecated()
+  public static void getBar$annotations();//  getBar$annotations()
+
   @org.jetbrains.annotations.NotNull()
-  public final kotlin.Unit getFooP(@MyAnnotation7() int);//  getFooP(int)
+  public final kotlin.Unit getFooP(@MyAnnotation7() @MyAnnotation8() int);//  getFooP(@MyAnnotation8() int)
 
   public  Test(@MyAnnotation6() @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
 
-  public final void fooF(@MyAnnotation7() int);//  fooF(int)
+  public final void fooF(@MyAnnotation7() @MyAnnotation8() int);//  fooF(@MyAnnotation8() int)
 
-  public final void fooWithNullableReceiver(@MyAnnotation7() @org.jetbrains.annotations.Nullable() java.lang.Integer, long);//  fooWithNullableReceiver(java.lang.Integer, long)
+  public final void fooWithNullableReceiver(@MyAnnotation7() @org.jetbrains.annotations.Nullable() @MyAnnotation8() java.lang.Integer, long);//  fooWithNullableReceiver(@MyAnnotation8() java.lang.Integer, long)
 
-  public final void setFooP(@MyAnnotation7() int, @org.jetbrains.annotations.NotNull() kotlin.Unit);//  setFooP(int, kotlin.Unit)
+  public final void setFooP(@MyAnnotation7() @MyAnnotation8() int, @org.jetbrains.annotations.NotNull() kotlin.Unit);//  setFooP(@MyAnnotation8() int, kotlin.Unit)
-}
+}

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

@@ -10,10 +10,6 @@ public final class Test /* Test*/ {
   @MyAnnotation2()
   public final void setBar(@MyAnnotation3() @org.jetbrains.annotations.NotNull() java.lang.String);//  setBar(java.lang.String)
 
-  @MyAnnotation4()
-  @java.lang.Deprecated()
-  public static void getBar$annotations();//  getBar$annotations()
-
   @org.jetbrains.annotations.NotNull()
   public final kotlin.Unit getFooP(@MyAnnotation7() int);//  getFooP(int)
 
@@ -24,4 +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/DeprecatedEnumEntry.descriptors.java

@@ -0,0 +1,16 @@
+public enum E /* p.E*/ {
+  @kotlin.Deprecated(message = "a") Entry1,
+  Entry2,
+  @kotlin.Deprecated(message = "b") Entry3;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() p.E[] values();//  values()
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<p.E> getEntries();//  getEntries()
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() p.E valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  private  E();//  .ctor()
+}

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

@@ -0,0 +1,16 @@
+public enum E /* p.E*/ {
+  @kotlin.Deprecated(message = "a") Entry1,
+  Entry2,
+  @kotlin.Deprecated(message = "b") Entry3;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<p.E> getEntries();//  getEntries()
+
+  @org.jetbrains.annotations.NotNull()
+  public static p.E valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static p.E[] values();//  values()
+
+  private  E();//  .ctor()
+}

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

@@ -0,0 +1,16 @@
+public enum MyEnumClass /* one.MyEnumClass*/ {
+  Entry;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() one.MyEnumClass[] values();//  values()
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<one.MyEnumClass> getEntries();//  getEntries()
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() one.MyEnumClass valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  private  MyEnumClass();//  .ctor()
+
+  public final int foo();//  foo()
+}

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

@@ -0,0 +1,16 @@
+public enum MyEnumClass /* one.MyEnumClass*/ {
+  Entry;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<one.MyEnumClass> getEntries();//  getEntries()
+
+  @org.jetbrains.annotations.NotNull()
+  public static one.MyEnumClass valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static one.MyEnumClass[] values();//  values()
+
+  private  MyEnumClass();//  .ctor()
+
+  public final int foo();//  foo()
+}

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

@@ -0,0 +1,16 @@
+public enum MyEnumClass /* one.MyEnumClass*/ {
+  Entry;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() one.MyEnumClass[] values();//  values()
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<one.MyEnumClass> getEntries();//  getEntries()
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() one.MyEnumClass valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  private  MyEnumClass();//  .ctor()
+
+  public final int doo();//  doo()
+}

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

@@ -0,0 +1,16 @@
+public enum MyEnumClass /* one.MyEnumClass*/ {
+  Entry;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<one.MyEnumClass> getEntries();//  getEntries()
+
+  @org.jetbrains.annotations.NotNull()
+  public static one.MyEnumClass valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static one.MyEnumClass[] values();//  values()
+
+  private  MyEnumClass();//  .ctor()
+
+  public final int doo();//  doo()
+}

compiler/testData/asJava/lightClasses/lightClassByFqName/NestedTypeAnnotations.descriptors.java

@@ -1,14 +1,14 @@
 public final class Nested /* foo.Nested*/ {
   @org.jetbrains.annotations.Nullable()
-  private java.util.List<? extends java.util.List<java.lang.String>> property;
+  private @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>> property;
 
   @org.jetbrains.annotations.Nullable()
-  public final java.util.List<java.util.List<java.lang.String>> function(@org.jetbrains.annotations.NotNull() java.util.List<? extends java.util.List<java.lang.String>>, @org.jetbrains.annotations.NotNull() java.util.List<? extends java.util.List<java.lang.String>>);//  function(java.util.List<? extends java.util.List<java.lang.String>>, java.util.List<? extends java.util.List<java.lang.String>>)
+  public final @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") java.util.List<@foo.AnotherAnnotation(k = foo.Nested.class) java.lang.String>> function(@org.jetbrains.annotations.NotNull() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>, @org.jetbrains.annotations.NotNull() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>);//  function(@foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>, @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>)
 
   @org.jetbrains.annotations.Nullable()
-  public final java.util.List<java.util.List<java.lang.String>> getProperty();//  getProperty()
+  public final @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") java.util.List<@foo.AnotherAnnotation(k = foo.Nested.class) java.lang.String>> getProperty();//  getProperty()
 
   public  Nested();//  .ctor()
 
-  public final void setProperty(@org.jetbrains.annotations.Nullable() java.util.List<? extends java.util.List<java.lang.String>>);//  setProperty(java.util.List<? extends java.util.List<java.lang.String>>)
+  public final void setProperty(@org.jetbrains.annotations.Nullable() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>);//  setProperty(@foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>)
 }

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

@@ -3,12 +3,12 @@ public final class Nested /* foo.Nested*/ {
   private java.util.List<? extends java.util.List<java.lang.String>> property = null /* initializer type: null */;
 
   @org.jetbrains.annotations.Nullable()
-  public final java.util.List<java.util.List<java.lang.String>> function(@org.jetbrains.annotations.NotNull() java.util.List<? extends java.util.List<java.lang.String>>, @org.jetbrains.annotations.NotNull() java.util.List<? extends java.util.List<java.lang.String>>);//  function(java.util.List<? extends java.util.List<java.lang.String>>, java.util.List<? extends java.util.List<java.lang.String>>)
+  public final @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") java.util.List<@foo.AnotherAnnotation(k = foo.Nested.class) java.lang.String>> function(@org.jetbrains.annotations.NotNull() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>, @org.jetbrains.annotations.NotNull() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>);//  function(@foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>, @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>)
 
   @org.jetbrains.annotations.Nullable()
   public final java.util.List<java.util.List<java.lang.String>> getProperty();//  getProperty()
 
   public  Nested();//  .ctor()
 
-  public final void setProperty(@org.jetbrains.annotations.Nullable() java.util.List<? extends java.util.List<java.lang.String>>);//  setProperty(java.util.List<? extends java.util.List<java.lang.String>>)
+  public final void setProperty(@org.jetbrains.annotations.Nullable() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>);//  setProperty(@foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List<java.lang.String>>)
 }

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

@@ -0,0 +1,7 @@
+public final class A /* A*/ {
+  public  A();//  .ctor()
+
+  public final void foo(@org.jetbrains.annotations.NotNull() @kotlin.ExtensionFunctionType() kotlin.jvm.functions.Function4<? super RS, ? super P, ? super P, ? super kotlin.coroutines.Continuation<? super kotlin.Unit>, ? extends java.lang.Object>);//  foo(@kotlin.ExtensionFunctionType() 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/compilationErrors/EnumNameOverride.descriptors.java

@@ -0,0 +1,14 @@
+public enum EnumNameOverride /* EnumNameOverride*/ implements Bar {
+  ;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() EnumNameOverride[] values();//  values()
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() EnumNameOverride valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<EnumNameOverride> getEntries();//  getEntries()
+
+  private  EnumNameOverride();//  .ctor()
+}

compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.descriptors.java

@@ -4,13 +4,13 @@ public enum AnnotationsOnEnumEntry /* two.AnnotationsOnEnumEntry*/ {
   EntryWithConstructor2;
 
   @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<two.AnnotationsOnEnumEntry> getEntries();//  getEntries()
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() two.AnnotationsOnEnumEntry[] values();//  values()
 
   @org.jetbrains.annotations.NotNull()
-  public static two.AnnotationsOnEnumEntry valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<two.AnnotationsOnEnumEntry> getEntries();//  getEntries()
 
   @org.jetbrains.annotations.NotNull()
-  public static two.AnnotationsOnEnumEntry[] values();//  values()
+  public static @org.jetbrains.annotations.NotNull() two.AnnotationsOnEnumEntry valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   private  AnnotationsOnEnumEntry(int);//  .ctor(int)
 

compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.lib.java

@@ -0,0 +1,42 @@
+public enum AnnotationsOnEnumEntry /* two.AnnotationsOnEnumEntry*/ {
+  @two.PropertyImplicitly() @two.FieldImplicitly() @two.FieldExplicitly() EntryWithoutConstructor,
+  @two.PropertyImplicitly() @two.FieldImplicitly() EntryWithConstructor,
+  EntryWithConstructor2;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<two.AnnotationsOnEnumEntry> getEntries();//  getEntries()
+
+  @org.jetbrains.annotations.NotNull()
+  public static two.AnnotationsOnEnumEntry valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static two.AnnotationsOnEnumEntry[] values();//  values()
+
+  private  AnnotationsOnEnumEntry(int);//  .ctor(int)
+
+  public final void foo();//  foo()
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.FIELD})
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.FIELD})
+public abstract @interface FieldExplicitly /* two.FieldExplicitly*/ {
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.FIELD})
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.FIELD})
+public abstract @interface FieldImplicitly /* two.FieldImplicitly*/ {
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Target(value = {})
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY})
+public abstract @interface PropertyExplicitly /* two.PropertyExplicitly*/ {
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Target(value = {})
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY})
+public abstract @interface PropertyImplicitly /* two.PropertyImplicitly*/ {
+}

compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.descriptors.java

@@ -3,13 +3,13 @@ public enum Em /* Em*/ {
   BAR;
 
   @org.jetbrains.annotations.NotNull()
-  public static Em valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Em[] values();//  values()
 
   @org.jetbrains.annotations.NotNull()
-  public static Em[] values();//  values()
+  public static @org.jetbrains.annotations.NotNull() Em valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<Em> getEntries();//  getEntries()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<Em> getEntries();//  getEntries()
 
   private  Em();//  .ctor()
 }

compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.lib.java

@@ -2,15 +2,15 @@ public enum Em /* Em*/ {
   FOO,
   BAR;
 
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<Em> getEntries();//  getEntries()
+
   @org.jetbrains.annotations.NotNull()
   public static Em valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
   public static Em[] values();//  values()
 
-  @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<Em> getEntries();//  getEntries()
-
   private  Em();//  .ctor()
 }
 

compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.descriptors.java

@@ -26,13 +26,13 @@ public enum Event /* Event*/ {
   public static final Event upTo(@org.jetbrains.annotations.NotNull() State);//  upTo(State)
 
   @org.jetbrains.annotations.NotNull()
-  public static Event valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Event[] values();//  values()
 
   @org.jetbrains.annotations.NotNull()
-  public static Event[] values();//  values()
+  public static @org.jetbrains.annotations.NotNull() Event valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<Event> getEntries();//  getEntries()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<Event> getEntries();//  getEntries()
 
   private  Event();//  .ctor()
 
@@ -51,13 +51,13 @@ public enum State /* State*/ {
   public static final State.Companion Companion;
 
   @org.jetbrains.annotations.NotNull()
-  public static State valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() State[] values();//  values()
 
   @org.jetbrains.annotations.NotNull()
-  public static State[] values();//  values()
+  public static @org.jetbrains.annotations.NotNull() State valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<State> getEntries();//  getEntries()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<State> getEntries();//  getEntries()
 
   private  State();//  .ctor()
 

compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.lib.java

@@ -0,0 +1,69 @@
+public enum Event /* Event*/ {
+  ON_CREATE,
+  ON_START,
+  ON_STOP,
+  ON_DESTROY;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Event.Companion Companion;
+
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.Nullable()
+  public static final Event upTo(@org.jetbrains.annotations.NotNull() State);//  upTo(State)
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<Event> getEntries();//  getEntries()
+
+  @org.jetbrains.annotations.NotNull()
+  public static Event valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static Event[] values();//  values()
+
+  private  Event();//  .ctor()
+
+  class Companion ...
+}
+
+public static final class Companion /* Event.Companion*/ {
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.Nullable()
+  public final Event upTo(@org.jetbrains.annotations.NotNull() State);//  upTo(State)
+
+  private  Companion();//  .ctor()
+}
+
+public enum State /* State*/ {
+  ENQUEUED,
+  RUNNING,
+  SUCCEEDED,
+  FAILED,
+  BLOCKED,
+  CANCELLED;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final State.Companion Companion;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<State> getEntries();//  getEntries()
+
+  @org.jetbrains.annotations.NotNull()
+  public static State valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static State[] values();//  values()
+
+  private  State();//  .ctor()
+
+  public final boolean isAtLeast(@org.jetbrains.annotations.NotNull() State);//  isAtLeast(State)
+
+  public final boolean isFinished();//  isFinished()
+
+  class Companion ...
+}
+
+public static final class Companion /* State.Companion*/ {
+  private  Companion();//  .ctor()
+
+  public final boolean done(@org.jetbrains.annotations.NotNull() State);//  done(State)
+}

compiler/testData/asJava/lightClasses/lightClassByPsi/enums.descriptors.java

@@ -16,13 +16,13 @@ public enum Color /* Color*/ {
   private final int rgb;
 
   @org.jetbrains.annotations.NotNull()
-  public static Color valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Color[] values();//  values()
 
   @org.jetbrains.annotations.NotNull()
-  public static Color[] values();//  values()
+  public static @org.jetbrains.annotations.NotNull() Color valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<Color> getEntries();//  getEntries()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<Color> getEntries();//  getEntries()
 
   private  Color(@org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
 
@@ -38,13 +38,13 @@ public enum Direction /* Direction*/ {
   EAST;
 
   @org.jetbrains.annotations.NotNull()
-  public static Direction valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Direction[] values();//  values()
 
   @org.jetbrains.annotations.NotNull()
-  public static Direction[] values();//  values()
+  public static @org.jetbrains.annotations.NotNull() Direction valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<Direction> getEntries();//  getEntries()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<Direction> getEntries();//  getEntries()
 
   private  Direction();//  .ctor()
 }
@@ -64,13 +64,13 @@ public abstract enum IntArithmetics /* IntArithmetics*/ implements java.util.fun
   };
 
   @org.jetbrains.annotations.NotNull()
-  public static IntArithmetics valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() IntArithmetics[] values();//  values()
 
   @org.jetbrains.annotations.NotNull()
-  public static IntArithmetics[] values();//  values()
+  public static @org.jetbrains.annotations.NotNull() IntArithmetics valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<IntArithmetics> getEntries();//  getEntries()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<IntArithmetics> getEntries();//  getEntries()
 
   private  IntArithmetics();//  .ctor()
 
@@ -106,13 +106,13 @@ public abstract enum ProtocolState /* ProtocolState*/ {
   public abstract ProtocolState signal();//  signal()
 
   @org.jetbrains.annotations.NotNull()
-  public static ProtocolState valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() ProtocolState[] values();//  values()
 
   @org.jetbrains.annotations.NotNull()
-  public static ProtocolState[] values();//  values()
+  public static @org.jetbrains.annotations.NotNull() ProtocolState valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<ProtocolState> getEntries();//  getEntries()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<ProtocolState> getEntries();//  getEntries()
 
   private  ProtocolState();//  .ctor()
 

compiler/testData/asJava/lightClasses/lightClassByPsi/enums.lib.java

@@ -15,15 +15,15 @@ public enum Color /* Color*/ {
 
   private final int rgb;
 
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<Color> getEntries();//  getEntries()
+
   @org.jetbrains.annotations.NotNull()
   public static Color valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
   public static Color[] values();//  values()
 
-  @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<Color> getEntries();//  getEntries()
-
   private  Color(int);//  .ctor(int)
 
   private  Color(java.lang.String);//  .ctor(java.lang.String)
@@ -37,15 +37,15 @@ public enum Direction /* Direction*/ {
   WEST,
   EAST;
 
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<Direction> getEntries();//  getEntries()
+
   @org.jetbrains.annotations.NotNull()
   public static Direction valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
   public static Direction[] values();//  values()
 
-  @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<Direction> getEntries();//  getEntries()
-
   private  Direction();//  .ctor()
 }
 
@@ -53,15 +53,15 @@ public abstract enum IntArithmetics /* IntArithmetics*/ implements java.util.fun
   PLUS,
   TIMES;
 
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<IntArithmetics> getEntries();//  getEntries()
+
   @org.jetbrains.annotations.NotNull()
   public static IntArithmetics valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
   public static IntArithmetics[] values();//  values()
 
-  @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<IntArithmetics> getEntries();//  getEntries()
-
   private  IntArithmetics();//  .ctor()
 
   public int applyAsInt(int, int);//  applyAsInt(int, int)
@@ -78,15 +78,15 @@ public abstract enum ProtocolState /* ProtocolState*/ {
   @org.jetbrains.annotations.NotNull()
   public abstract ProtocolState signal();//  signal()
 
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<ProtocolState> getEntries();//  getEntries()
+
   @org.jetbrains.annotations.NotNull()
   public static ProtocolState valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
   public static ProtocolState[] values();//  values()
 
-  @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<ProtocolState> getEntries();//  getEntries()
-
   private  ProtocolState();//  .ctor()
 
   class TALKING ...

compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.descriptors.java

@@ -0,0 +1,56 @@
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
+}
+
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+}
+
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+}
+
+public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
+  @org.jetbrains.annotations.NotNull()
+  public static final Out<? extends Open> bar();//  bar()
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
+  public static final int foo(boolean, @org.jetbrains.annotations.NotNull() Out<? extends java.lang.Integer>);//  foo(boolean, Out<? extends java.lang.Integer>)
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public static final In<Open> foo3();//  foo3()
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public static final Out<error.NonExistentClass> foo2();//  foo2()
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  public static final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long);//  bar(boolean, In<java.lang.Long>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long)
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  public static final void deepOpen(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);//  deepOpen(Out<Out<Out<Open>>>)
+
+  @org.jetbrains.annotations.NotNull()
+  public static final @kotlin.jvm.JvmSuppressWildcards() OutPair<Open, ? extends @kotlin.jvm.JvmWildcard() OutPair<Open, ? extends @kotlin.jvm.JvmWildcard() Out<Open>>> combination();//  combination()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final @kotlin.jvm.JvmSuppressWildcards(suppress = false) OutPair<? extends Final, @kotlin.jvm.JvmSuppressWildcards() OutPair<Out<Final>, Out<? extends @kotlin.jvm.JvmSuppressWildcards(suppress = false) Final>>> falseTrueFalse();//  falseTrueFalse()
+
+  public static final void simpleIn(@org.jetbrains.annotations.NotNull() In<? super @kotlin.jvm.JvmWildcard() java.lang.Object>);//  simpleIn(In<? super @kotlin.jvm.JvmWildcard() java.lang.Object>)
+
+  public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends @kotlin.jvm.JvmWildcard() Final>);//  simpleOut(Out<? extends @kotlin.jvm.JvmWildcard() Final>)
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+}

compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java

@@ -24,23 +24,23 @@ public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
 
   @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   @org.jetbrains.annotations.NotNull()
-  public static final Out<error.NonExistentClass> foo2();//  foo2()
+  public static final Out<T> foo2();//  foo2()
 
   @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  public static final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, long);//  bar(boolean, In<java.lang.Long>, long)
+  public static final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long);//  bar(boolean, In<java.lang.Long>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long)
 
   @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   public static final void deepOpen(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);//  deepOpen(Out<Out<Out<Open>>>)
 
   @org.jetbrains.annotations.NotNull()
-  public static final OutPair<? extends Final, OutPair<Out<Final>, Out<? extends Final>>> falseTrueFalse();//  falseTrueFalse()
+  public static final @kotlin.jvm.JvmSuppressWildcards() OutPair<Open, @kotlin.jvm.JvmWildcard() ? extends OutPair<Open, ? extends Out<Open>>> combination();//  combination()
 
   @org.jetbrains.annotations.NotNull()
-  public static final OutPair<Open, ? extends OutPair<Open,? extends Out<Open>>> combination();//  combination()
+  public static final @kotlin.jvm.JvmSuppressWildcards(suppress = false) OutPair<? extends Final, @kotlin.jvm.JvmSuppressWildcards() OutPair<Out<Final>, Out<@kotlin.jvm.JvmSuppressWildcards(suppress = false) ? extends Final>>> falseTrueFalse();//  falseTrueFalse()
 
-  public static final void simpleIn(@org.jetbrains.annotations.NotNull() In<? super java.lang.Object>);//  simpleIn(In<? super java.lang.Object>)
+  public static final void simpleIn(@org.jetbrains.annotations.NotNull() In<@kotlin.jvm.JvmWildcard() ? super java.lang.Object>);//  simpleIn(In<@kotlin.jvm.JvmWildcard() ? super java.lang.Object>)
 
-  public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
+  public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out<@kotlin.jvm.JvmWildcard() ? extends Final>);//  simpleOut(Out<@kotlin.jvm.JvmWildcard() ? extends Final>)
 }
 
 public class Open /* Open*/ {

compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.lib.java

@@ -24,7 +24,7 @@ public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
 
   @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   @org.jetbrains.annotations.NotNull()
-  public static final Out<T> foo2();//  foo2()
+  public static final Out<error.NonExistentClass> foo2();//  foo2()
 
   @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   public static final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, long);//  bar(boolean, In<java.lang.Long>, long)

compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.descriptors.java

@@ -0,0 +1,26 @@
+public enum Foo /* Foo*/ {
+  ;
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Foo[] values();//  values()
+
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() Foo valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  public final int getX();//  getX()
+}
+
+public final class InlineInheritance /* InlineInheritance*/ {
+  public final int getV();//  getV()
+
+  public int getX();//  getX()
+
+  public int y();//  y()
+}
+
+public final class InlinedDelegate /* InlinedDelegate*/<T>  {
+  public final T getNode();//  getNode()
+}
+
+public final class UInt /* UInt*/ {
+}

compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java

@@ -1,29 +0,0 @@
-public enum Foo /* Foo*/ {
-  ;
-
-  private final int x;
-
-  public final int getX();//  getX()
-}
-
-public final class InlineInheritance /* InlineInheritance*/ implements I {
-  private final int v;
-
-  @java.lang.Override()
-  public int getX();//  getX()
-
-  @java.lang.Override()
-  public int y();//  y()
-
-  public final int getV();//  getV()
-}
-
-public final class InlinedDelegate /* InlinedDelegate*/<T>  {
-  private T node;
-
-  public final T getNode();//  getNode()
-}
-
-public final class UInt /* UInt*/ {
-  private final int value;
-}

compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java

@@ -1,26 +1,29 @@
 public enum Foo /* Foo*/ {
   ;
 
-  @org.jetbrains.annotations.NotNull()
+  private final int x;
-  public static Foo valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public static Foo[] values();//  values()
 
   public final int getX();//  getX()
 }
 
-public final class InlineInheritance /* InlineInheritance*/ {
+public final class InlineInheritance /* InlineInheritance*/ implements I {
-  public final int getV();//  getV()
+  private final int v;
 
+  @java.lang.Override()
   public int getX();//  getX()
 
+  @java.lang.Override()
   public int y();//  y()
+
+  public final int getV();//  getV()
 }
 
 public final class InlinedDelegate /* InlinedDelegate*/<T>  {
+  private T node;
+
   public final T getNode();//  getNode()
 }
 
 public final class UInt /* UInt*/ {
+  private final int value;
 }

compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.lib.java

@@ -0,0 +1,26 @@
+public enum Foo /* Foo*/ {
+  ;
+
+  @org.jetbrains.annotations.NotNull()
+  public static Foo valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static Foo[] values();//  values()
+
+  public final int getX();//  getX()
+}
+
+public final class InlineInheritance /* InlineInheritance*/ {
+  public final int getV();//  getV()
+
+  public int getX();//  getX()
+
+  public int y();//  y()
+}
+
+public final class InlinedDelegate /* InlinedDelegate*/<T>  {
+  public final T getNode();//  getNode()
+}
+
+public final class UInt /* UInt*/ {
+}

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.descriptors.java

@@ -19,25 +19,25 @@ public final class Container /* Container*/ {
   public final int foo(boolean, @org.jetbrains.annotations.NotNull() Out<? extends java.lang.Integer>);//  foo(boolean, Out<? extends java.lang.Integer>)
 
   @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  public final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, long);//  bar(boolean, In<java.lang.Long>, long)
+  public final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long);//  bar(boolean, In<java.lang.Long>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long)
 
   @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   public final void deepOpen(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);//  deepOpen(Out<Out<Out<Open>>>)
 
   @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  public final void zoo(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>, @org.jetbrains.annotations.NotNull() Out<? extends Open>);//  zoo(Out<Out<Out<Open>>>, Out<? extends Open>)
+  public final void zoo(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>, @org.jetbrains.annotations.NotNull() @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out<? extends Open>);//  zoo(Out<Out<Out<Open>>>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out<? extends Open>)
 
   @org.jetbrains.annotations.NotNull()
-  public final OutPair<? extends Final, OutPair<Out<Final>, Out<? extends Final>>> falseTrueFalse();//  falseTrueFalse()
+  public final @kotlin.jvm.JvmSuppressWildcards() OutPair<Open, ? extends @kotlin.jvm.JvmWildcard() OutPair<Open, ? extends @kotlin.jvm.JvmWildcard() Out<Open>>> combination();//  combination()
 
   @org.jetbrains.annotations.NotNull()
-  public final OutPair<Open, ? extends OutPair<Open,? extends Out<Open>>> combination();//  combination()
+  public final @kotlin.jvm.JvmSuppressWildcards(suppress = false) OutPair<? extends Final, @kotlin.jvm.JvmSuppressWildcards() OutPair<Out<Final>, Out<? extends @kotlin.jvm.JvmSuppressWildcards(suppress = false) Final>>> falseTrueFalse();//  falseTrueFalse()
 
   public  Container();//  .ctor()
 
-  public final void simpleIn(@org.jetbrains.annotations.NotNull() In<? super java.lang.Object>);//  simpleIn(In<? super java.lang.Object>)
+  public final void simpleIn(@org.jetbrains.annotations.NotNull() In<? super @kotlin.jvm.JvmWildcard() java.lang.Object>);//  simpleIn(In<? super @kotlin.jvm.JvmWildcard() java.lang.Object>)
 
-  public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
+  public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends @kotlin.jvm.JvmWildcard() Final>);//  simpleOut(Out<? extends @kotlin.jvm.JvmWildcard() Final>)
 }
 
 public final class ContainerForPropertyAndAccessors /* ContainerForPropertyAndAccessors*/ {
@@ -45,22 +45,22 @@ public final class ContainerForPropertyAndAccessors /* ContainerForPropertyAndAc
   private Out<? extends Open> bar;
 
   @org.jetbrains.annotations.NotNull()
-  private final In<? super java.lang.Object> simpleIn;
+  private final In<? super @kotlin.jvm.JvmWildcard() java.lang.Object> simpleIn;
 
   @org.jetbrains.annotations.NotNull()
-  private final Out<? extends Final> simpleOut;
+  private final Out<? extends @kotlin.jvm.JvmWildcard() Final> simpleOut;
 
   @org.jetbrains.annotations.NotNull()
   private final Out<Out<Out<Open>>> deepOpen;
 
   @org.jetbrains.annotations.NotNull()
-  public final In<? super java.lang.Object> getSimpleIn();//  getSimpleIn()
+  public final @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out<? extends Open> getZoo(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);//  getZoo(Out<Out<Out<Open>>>)
 
   @org.jetbrains.annotations.NotNull()
-  public final Out<? extends Final> getSimpleOut();//  getSimpleOut()
+  public final In<? super @kotlin.jvm.JvmWildcard() java.lang.Object> getSimpleIn();//  getSimpleIn()
 
   @org.jetbrains.annotations.NotNull()
-  public final Out<? extends Open> getZoo(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);//  getZoo(Out<Out<Out<Open>>>)
+  public final Out<? extends @kotlin.jvm.JvmWildcard() Final> getSimpleOut();//  getSimpleOut()
 
   @org.jetbrains.annotations.NotNull()
   public final Out<Open> getBar();//  getBar()
@@ -83,7 +83,7 @@ public final class HasAnnotation /* HasAnnotation*/ {
 
   public final void doesNot(@org.jetbrains.annotations.NotNull() Out<Out<Open>>);//  doesNot(Out<Out<Open>>)
 
-  public final void parameterDisagrees(@org.jetbrains.annotations.NotNull() Out<? extends java.lang.Integer>);//  parameterDisagrees(Out<? extends java.lang.Integer>)
+  public final void parameterDisagrees(@org.jetbrains.annotations.NotNull() @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out<? extends java.lang.Integer>);//  parameterDisagrees(@kotlin.jvm.JvmSuppressWildcards(suppress = false) Out<? extends java.lang.Integer>)
 }
 
 public final class In /* In*/<Z>  {

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java

@@ -19,25 +19,25 @@ public final class Container /* Container*/ {
   public final int foo(boolean, @org.jetbrains.annotations.NotNull() Out<? extends java.lang.Integer>);//  foo(boolean, Out<? extends java.lang.Integer>)
 
   @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  public final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, long);//  bar(boolean, In<java.lang.Long>, long)
+  public final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long);//  bar(boolean, In<java.lang.Long>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long)
 
   @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   public final void deepOpen(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);//  deepOpen(Out<Out<Out<Open>>>)
 
   @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  public final void zoo(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>, @org.jetbrains.annotations.NotNull() Out<? extends Open>);//  zoo(Out<Out<Out<Open>>>, Out<? extends Open>)
+  public final void zoo(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>, @org.jetbrains.annotations.NotNull() @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out<? extends Open>);//  zoo(Out<Out<Out<Open>>>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out<? extends Open>)
 
   @org.jetbrains.annotations.NotNull()
-  public final OutPair<? extends Final, OutPair<Out<Final>, Out<? extends Final>>> falseTrueFalse();//  falseTrueFalse()
+  public final @kotlin.jvm.JvmSuppressWildcards() OutPair<Open, @kotlin.jvm.JvmWildcard() ? extends OutPair<Open, ? extends Out<Open>>> combination();//  combination()
 
   @org.jetbrains.annotations.NotNull()
-  public final OutPair<Open, ? extends OutPair<Open,? extends Out<Open>>> combination();//  combination()
+  public final @kotlin.jvm.JvmSuppressWildcards(suppress = false) OutPair<? extends Final, @kotlin.jvm.JvmSuppressWildcards() OutPair<Out<Final>, Out<@kotlin.jvm.JvmSuppressWildcards(suppress = false) ? extends Final>>> falseTrueFalse();//  falseTrueFalse()
 
   public  Container();//  .ctor()
 
-  public final void simpleIn(@org.jetbrains.annotations.NotNull() In<? super java.lang.Object>);//  simpleIn(In<? super java.lang.Object>)
+  public final void simpleIn(@org.jetbrains.annotations.NotNull() In<@kotlin.jvm.JvmWildcard() ? super java.lang.Object>);//  simpleIn(In<@kotlin.jvm.JvmWildcard() ? super java.lang.Object>)
 
-  public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
+  public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<@kotlin.jvm.JvmWildcard() ? extends Final>);//  simpleOut(Out<@kotlin.jvm.JvmWildcard() ? extends Final>)
 }
 
 public final class ContainerForPropertyAndAccessors /* ContainerForPropertyAndAccessors*/ {
@@ -83,7 +83,7 @@ public final class HasAnnotation /* HasAnnotation*/ {
 
   public final void doesNot(@org.jetbrains.annotations.NotNull() Out<Out<Open>>);//  doesNot(Out<Out<Open>>)
 
-  public final void parameterDisagrees(@org.jetbrains.annotations.NotNull() Out<? extends java.lang.Integer>);//  parameterDisagrees(Out<? extends java.lang.Integer>)
+  public final void parameterDisagrees(@org.jetbrains.annotations.NotNull() @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out<? extends java.lang.Integer>);//  parameterDisagrees(@kotlin.jvm.JvmSuppressWildcards(suppress = false) Out<? extends java.lang.Integer>)
 }
 
 public final class In /* In*/<Z>  {

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java

@@ -0,0 +1,107 @@
+public abstract interface A /* A*/<T>  {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public abstract Out<T> foo();//  foo()
+}
+
+public abstract interface B /* B*/ {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public abstract In<Open> foo();//  foo()
+}
+
+public final class Container /* Container*/ {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
+  @org.jetbrains.annotations.NotNull()
+  public final Out<? extends Open> bar();//  bar()
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
+  public final int foo(boolean, @org.jetbrains.annotations.NotNull() Out<? extends java.lang.Integer>);//  foo(boolean, Out<? extends java.lang.Integer>)
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  public final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, long);//  bar(boolean, In<java.lang.Long>, long)
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  public final void deepOpen(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);//  deepOpen(Out<Out<Out<Open>>>)
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  public final void zoo(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>, @org.jetbrains.annotations.NotNull() Out<? extends Open>);//  zoo(Out<Out<Out<Open>>>, Out<? extends Open>)
+
+  @org.jetbrains.annotations.NotNull()
+  public final OutPair<? extends Final, OutPair<Out<Final>, Out<? extends Final>>> falseTrueFalse();//  falseTrueFalse()
+
+  @org.jetbrains.annotations.NotNull()
+  public final OutPair<Open, ? extends OutPair<Open, ? extends Out<Open>>> combination();//  combination()
+
+  public  Container();//  .ctor()
+
+  public final void simpleIn(@org.jetbrains.annotations.NotNull() In<? super java.lang.Object>);//  simpleIn(In<? super java.lang.Object>)
+
+  public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
+}
+
+public final class ContainerForPropertyAndAccessors /* ContainerForPropertyAndAccessors*/ {
+  @org.jetbrains.annotations.NotNull()
+  private Out<? extends Open> bar;
+
+  @org.jetbrains.annotations.NotNull()
+  private final In<? super java.lang.Object> simpleIn;
+
+  @org.jetbrains.annotations.NotNull()
+  private final Out<? extends Final> simpleOut;
+
+  @org.jetbrains.annotations.NotNull()
+  private final Out<Out<Out<Open>>> deepOpen;
+
+  @org.jetbrains.annotations.NotNull()
+  public final In<? super java.lang.Object> getSimpleIn();//  getSimpleIn()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Out<? extends Final> getSimpleOut();//  getSimpleOut()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Out<? extends Open> getZoo(@org.jetbrains.annotations.NotNull() Out<? extends Out<? extends Out<? extends Open>>>);//  getZoo(Out<? extends Out<? extends Out<? extends Open>>>)
+
+  @org.jetbrains.annotations.NotNull()
+  public final Out<Open> getBar();//  getBar()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Out<Out<Out<Open>>> getDeepOpen();//  getDeepOpen()
+
+  public  ContainerForPropertyAndAccessors();//  .ctor()
+
+  public final void setBar(@org.jetbrains.annotations.NotNull() Out<? extends Open>);//  setBar(Out<? extends Open>)
+}
+
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
+}
+
+@kotlin.jvm.JvmSuppressWildcards(suppress = true)
+public final class HasAnnotation /* HasAnnotation*/ {
+  public  HasAnnotation();//  .ctor()
+
+  public final void doesNot(@org.jetbrains.annotations.NotNull() Out<Out<Open>>);//  doesNot(Out<Out<Open>>)
+
+  public final void parameterDisagrees(@org.jetbrains.annotations.NotNull() Out<? extends java.lang.Integer>);//  parameterDisagrees(Out<? extends java.lang.Integer>)
+}
+
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+}
+
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+}

compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.descriptors.java

@@ -35,13 +35,13 @@ public enum StrangeEnum /* StrangeEnum*/ {
   private final java.lang.String size;
 
   @org.jetbrains.annotations.NotNull()
-  public static StrangeEnum valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+  public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() StrangeEnum[] values();//  values()
 
   @org.jetbrains.annotations.NotNull()
-  public static StrangeEnum[] values();//  values()
+  public static @org.jetbrains.annotations.NotNull() StrangeEnum valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<StrangeEnum> getEntries();//  getEntries()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<StrangeEnum> getEntries();//  getEntries()
 
   private  StrangeEnum(java.lang.String);//  .ctor(java.lang.String)
 

compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java

@@ -34,15 +34,15 @@ public enum StrangeEnum /* StrangeEnum*/ {
   @org.jetbrains.annotations.NotNull()
   public final java.lang.String getSize();//  getSize()
 
+  @org.jetbrains.annotations.NotNull()
+  public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries<StrangeEnum> getEntries();//  getEntries()
+
   @org.jetbrains.annotations.NotNull()
   public static StrangeEnum valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
   public static StrangeEnum[] values();//  values()
 
-  @org.jetbrains.annotations.NotNull()
-  public static kotlin.enums.EnumEntries<StrangeEnum> getEntries();//  getEntries()
-
   private  StrangeEnum(java.lang.String);//  .ctor(java.lang.String)
 }
 

compiler/tests-common/tests/org/jetbrains/kotlin/asJava/PsiClassRenderer.kt

@@ -38,8 +38,6 @@ class PsiClassRenderer private constructor(
     }
 
     companion object {
-        var extendedTypeRenderer: ThreadLocal<Boolean> = ThreadLocal.withInitial { false }
-
         fun renderClass(
             psiClass: PsiClass,
             renderInner: Boolean = false,
@@ -84,8 +82,9 @@ class PsiClassRenderer private constructor(
     }
 
     private fun PsiType.renderType() = StringBuffer().also { renderType(it) }.toString()
+
     private fun PsiType.renderType(sb: StringBuffer) {
-        if (extendedTypeRenderer.get() && annotations.isNotEmpty()) {
+        if (annotations.isNotEmpty()) {
             sb.append(annotations.joinToString(" ", postfix = " ") { it.renderAnnotation() })
         }
         when (this) {
@@ -108,8 +107,24 @@ class PsiClassRenderer private constructor(
                 componentType.renderType(sb)
                 sb.append("[]")
             }
+            is PsiWildcardType -> {
+                if (!isBounded) {
+                    sb.append("?")
+                } else {
+                    if (isSuper) {
+                        sb.append(PsiWildcardType.SUPER_PREFIX)
+                    } else {
+                        sb.append(PsiWildcardType.EXTENDS_PREFIX)
+                    }
+
+                    bound?.renderType(sb)
+                }
+            }
+            is PsiPrimitiveType -> {
+                sb.append(name)
+            }
             else -> {
-                sb.append(canonicalText)
+                sb.append(getCanonicalText(/* annotated = */ true))
             }
         }
     }