[Analysis API] update testdata after renderer rework

The new testdata seems to be more correct or just different

^KTIJ-23268

analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/assignment/arrayAssignmentTargetUnresovledSet.txt

@@ -1,2 +1,2 @@
 expression: arr[0]
-type: ERROR_TYPE <Unresolved name: set>
+type: ERROR_TYPE(Unresolved name: set)

analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/smartcast_multi.txt

@@ -1,2 +1,2 @@
 expression: a
-type: (A&B)
+type: A & B

analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/unresolvedSuper_multipleSuperTypes.txt

@@ -1,2 +1,2 @@
 expression: super
-type: (A&B)
+type: A & B

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.descriptors.txt

@@ -1,2 +1,2 @@
-KtType: ERROR_TYPE
+KtType: ERROR
 PsiType: null

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.descriptors.txt

@@ -0,0 +1,2 @@
+KtType: kotlin.Int
+PsiType: PsiType:int

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_constructor.txt

@@ -1,2 +1,2 @@
-KtType: Outer.<no name provided>.Inner
+KtType: Outer.`<no name provided>`.Inner
 PsiType: null

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/typeParamFlexibleUpperBound.txt

@@ -1,2 +1,2 @@
-KtType: T!!
+KtType: T & kotlin.Any
 PsiType: PsiType:T

analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature/propertyWithAccessors.txt

@@ -1,6 +1,8 @@
 KtDeclaration: KtProperty
 Symbol:
 var foo: kotlin.Int
+  get()
+  set(value: kotlin.Int)
 
 Signature:
 KtVariableLikeSignature:

analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_stable.txt

@@ -1,3 +1,3 @@
 expression: a
 isStable: true
-smartCastType: (A&B)
+smartCastType: A & B

analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_unstable.descriptors.txt

@@ -1,3 +0,0 @@
-expression: a
-isStable: false
-smartCastType: (A & B)

analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_unstable.txt

@@ -1,3 +1,3 @@
 expression: a
 isStable: false
-smartCastType: (A&B)
+smartCastType: A & B

analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_stable.txt

@@ -1,3 +1,3 @@
 expression: a
 isStable: true
-smartCastType: (A&B)
+smartCastType: A & B

analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_unstable.txt

@@ -1,3 +1,3 @@
 expression: a
 isStable: false
-smartCastType: (A&B)
+smartCastType: A & B

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/F.rendered

@@ -1,4 +1,4 @@
 open class A
 
-class B : A
+class B : A()
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.descriptors.rendered

@@ -0,0 +1,10 @@
+abstract class A {
+  abstract class Nested
+}
+
+typealias TA = A
+
+class B : A() {
+  class NestedInB : A.Nested()
+}
+

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.rendered

@@ -4,7 +4,7 @@ abstract class A {
 
 typealias TA = A
 
-class B : TA {
-  class NestedInB : A.Nested
+class B : TA() {
+  class NestedInB : A.Nested()
 }
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedSuperType.rendered

@@ -1,10 +1,10 @@
 abstract class My {
-  abstract class NestedOne : My {
-    abstract class NestedTwo : My.NestedOne
+  abstract class NestedOne : My() {
+    abstract class NestedTwo : My.NestedOne()
   }
 }
 
-class Your : My {
-  class NestedThree : My.NestedOne
+class Your : My() {
+  class NestedThree : My.NestedOne()
 }
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.descriptors.rendered

@@ -5,9 +5,7 @@ annotation class base
 annotation class derived
 
 @base
-class correct {
-  constructor(x: Int)
-
+class correct(x: Int) {
   @base
   constructor()
 
@@ -17,8 +15,8 @@ class correct {
 
 @base
 enum class My {
-  FIRST,
-  SECOND
+  @base FIRST,
+  @base SECOND
 }
 
 @base

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.rendered

@@ -5,9 +5,7 @@ annotation class base
 annotation class derived
 
 @base
-class correct {
-  constructor(@base x: Int)
-
+class correct(@base x: Int) {
   @base
   constructor()
 
@@ -17,8 +15,8 @@ class correct {
 
 @base
 enum class My {
-  FIRST,
-  SECOND
+  @base FIRST,
+  @base SECOND
 }
 
 @base

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.descriptors.rendered

@@ -1,16 +0,0 @@
-object A {
-  constructor()
-}
-
-enum class B {
-  X
-}
-
-class C {
-  companion object {
-    constructor()
-  }
-}
-
-val anonObject: Any
-

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.descriptors.rendered

@@ -0,0 +1,14 @@
+interface MyRwProperty<in T, V> {
+  operator fun getValue(thisRef: T, property: Any): V
+
+  operator fun setValue(thisRef: T, property: Any, value: V)
+}
+
+val x: Int
+
+val delegate: MyRwProperty<Any?, Int>
+
+val value: Int
+
+var variable: Int
+

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.rendered

@@ -5,10 +5,14 @@ interface MyRwProperty<in T, V> {
 }
 
 val x: Int
+  get()
 
 val delegate: MyRwProperty<Any?, Int>
 
 val value: Int
+  get()
 
 var variable: Int
+  get()
+  set(variable: Int)
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/derivedClass.rendered

@@ -1,12 +1,8 @@
-open class Base<T> {
-  constructor(x: T)
-
+open class Base<T>(x: T) {
   val x: T
 }
 
-class Derived<T : Any> : Base<T> {
-  constructor(x: T)
-}
+class Derived<T : Any>(x: T) : Base<T>()
 
 fun <T : Any> create(x: T): Derived<T>
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums.rendered

@@ -4,27 +4,31 @@ enum class Order {
   THIRD
 }
 
-enum class Planet {
-  EARTH,
-  MERCURY,
-  VENERA;
-
-  constructor(m: Double, r: Double)
-
-  val g: Double
-
-  val m: Double
-
-  internal val r: Double
+enum class Planet(m: Double, r: Double) {
+  EARTH {
+    override fun sayHello()
+  },
+  MERCURY {
+    override fun sayHello()
+  },
+  VENERA {
+    override fun sayHello()
+  };
 
   abstract fun sayHello()
 
   companion object {
     const val G: Double
   }
+
+  internal val r: Double
+
+  val g: Double
+
+  val m: Double
 }
 
-enum class PseudoInsn {
+enum class PseudoInsn(signature: String) {
   AS_NOT_NULL,
   FAKE_ALWAYS_FALSE_IFEQ,
   FAKE_ALWAYS_TRUE_IFEQ,
@@ -33,10 +37,8 @@ enum class PseudoInsn {
   SAVE_STACK_BEFORE_TRY,
   STORE_NOT_NULL;
 
-  constructor(signature: String = ...)
+  fun emit()
 
   val signature: String
-
-  fun emit()
 }
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums2.rendered

@@ -4,14 +4,16 @@ object O1 : Some
 
 object O2 : Some
 
-enum class SomeEnum {
-  FIRST,
-  SECOND;
-
-  constructor(x: Some)
-
-  val x: Some
+enum class SomeEnum(x: Some) {
+  FIRST {
+    override fun check(y: Some): Boolean
+  },
+  SECOND {
+    override fun check(y: Some): Boolean
+  };
 
   abstract fun check(y: Some): Boolean
+
+  val x: Some
 }
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericProperty.rendered

@@ -1,4 +1,5 @@
 fun <T> genericFoo(): T
 
 val <T> T.generic: T
+  get()
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/nestedClass.rendered

@@ -1,14 +1,10 @@
-abstract class Base {
-  constructor(s: String)
-
+abstract class Base(s: String) {
   val s: String
 }
 
 class Outer {
-  class Derived : Base {
-    constructor(s: String)
-  }
+  class Derived(s: String) : Base()
 
-  object Obj : Base
+  object Obj : Base()
 }
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleClass.rendered

@@ -1,17 +1,19 @@
 interface SomeInterface {
-  val bar: Boolean
-
   fun foo(x: Int, y: String): String
+
+  val bar: Boolean
 }
 
 class SomeClass : SomeInterface {
-  override var bar: Boolean
-
-  private val baz: Int
-
   lateinit var fau: Double
 
   override fun foo(x: Int, y: String): String
+
+  override var bar: Boolean
+    get()
+    set(value: Boolean)
+
+  private val baz: Int
 }
 
 inline class InlineClass

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleTypeAlias.descriptors.rendered

@@ -0,0 +1,6 @@
+interface B
+
+typealias C = B
+
+class D : B
+

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeAliasWithGeneric.descriptors.rendered

@@ -0,0 +1,8 @@
+open class A
+
+interface B<S, T : A>
+
+typealias C<T> = B<T, A>
+
+class D : B<A, A>
+

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameterVsNested.rendered

@@ -1,16 +1,16 @@
 interface Some
 
 abstract class My<T : Some> {
+  abstract class Some : My<Some>.T()
+
+  abstract fun foo(arg: T)
+
   abstract val x: T
 
   abstract val y: My<Some>.T
 
   abstract val z: My<Some>.T
 
-  abstract fun foo(arg: T)
-
-  abstract class Some : My<Some>.T
-
   open inner class T
 }
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameters.rendered

@@ -10,7 +10,7 @@ typealias AnyList = List<*>
 
 abstract class AbstractList<out T : Any> : List<T>
 
-class SomeList : AbstractList<Int> {
+class SomeList : AbstractList<Int>() {
   override infix fun concat(other: List<Int>): List<Int>
 
   override operator fun get(index: Int): Int

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.rendered

@@ -2,9 +2,7 @@
 annotation class A1
 
 @Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE])
-annotation class A2 {
-  constructor(value: String)
-
+annotation class A2(value: String) {
   val value: String
 }
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.rendered

@@ -1,7 +1,5 @@
 @Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE])
-annotation class A {
-  constructor(value: Int)
-
+annotation class A(value: Int) {
   val value: Int
 }
 

analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.rendered

@@ -2,5 +2,5 @@ interface A
 
 interface B
 
-class C<T : A> where T : B
+class C<T> where T : A, T : B
 

analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/localTypes.descriptors.kt

@@ -1,7 +0,0 @@
-fun test() {
-    class A
-    @Denotable("A") A()
-    @Denotable("kotlin.collections.List<A>") listOf(A())
-    @Nondenotable("`<no name provided>`") object {}
-    @Nondenotable("kotlin.collections.List<`<no name provided>`>") listOf(object {})
-}

analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/localTypes.kt

@@ -2,6 +2,6 @@ fun test() {
     class A
     @Denotable("A") A()
     @Denotable("kotlin.collections.List<A>") listOf(A())
-    @Nondenotable("<anonymous>") object {}
-    @Nondenotable("kotlin.collections.List<<anonymous>>") listOf(object {})
+    @Nondenotable("`<anonymous>`") object {}
+    @Nondenotable("kotlin.collections.List<`<anonymous>`>") listOf(object {})
 }

analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/smartcast.descriptors.kt

@@ -18,7 +18,7 @@ fun test(a: Any?) {
         (@Denotable("kotlin.Any?") a).length
         (@Denotable("kotlin.Any?") a).inc()
     }
-    @Nondenotable("(kotlin.Comparable<*> & java.io.Serializable)") if (true) {
+    @Nondenotable("kotlin.Comparable<*> & java.io.Serializable") if (true) {
         ""
     } else {
         1

analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/smartcast.kt

@@ -2,7 +2,7 @@ fun test(a: Any?) {
     if (a is String) {
         (@Denotable("kotlin.String") a).length
         if (a is Int) {
-            (@Nondenotable("(kotlin.String&kotlin.Int)") a).inc()
+            (@Nondenotable("kotlin.String & kotlin.Int") a).inc()
         }
         if (a is String) {
             (@Denotable("kotlin.String") a).length
@@ -15,10 +15,10 @@ fun test(a: Any?) {
         (@Denotable("kotlin.Nothing?") a).isNothing()
     }
     if (a is String || a is Int) {
-        (@Nondenotable("(kotlin.Comparable<(kotlin.String&kotlin.Int)>&java.io.Serializable)") a).length
-        (@Nondenotable("(kotlin.Comparable<(kotlin.String&kotlin.Int)>&java.io.Serializable)") a).inc()
+        (@Nondenotable("kotlin.Comparable<kotlin.String & kotlin.Int> & java.io.Serializable") a).length
+        (@Nondenotable("kotlin.Comparable<kotlin.String & kotlin.Int> & java.io.Serializable") a).inc()
     }
-    @Nondenotable("(kotlin.Comparable<*>&java.io.Serializable)") if (true) {
+    @Nondenotable("kotlin.Comparable<*> & java.io.Serializable") if (true) {
         ""
     } else {
         1

analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/typeParameter.descriptors.kt

@@ -3,7 +3,7 @@ interface A
 fun <T> test(t: T) {
     @Denotable("T") t
     if (t != null) {
-        (@Nondenotable("T & Any") t).equals("")
+        (@Nondenotable("T & kotlin.Any") t).equals("")
     }
     val outs = take(getOutProjection())
     @Denotable("A") outs

analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/typeParameter.kt

@@ -3,7 +3,7 @@ interface A
 fun <T> test(t: T) {
     @Denotable("T") t
     if (t != null) {
-        (@Denotable("T!!") t).equals("")
+        (@Denotable("T & kotlin.Any") t).equals("")
     }
     val outs = take(getOutProjection())
     @Denotable("A") outs

analysis/analysis-api/testData/components/typeInfoProvider/superTypes/contravariant.txt

@@ -1,17 +1,17 @@
 [direct super types]
-kotlin.collections.List<CapturedType(in kotlin/String)>
-kotlin.collections.MutableCollection<CapturedType(in kotlin/String)>
+kotlin.collections.List<CapturedType(in kotlin.String)>
+kotlin.collections.MutableCollection<CapturedType(in kotlin.String)>
 
 [approximated direct super types]
 kotlin.collections.List<kotlin.Any?>
 kotlin.collections.MutableCollection<in kotlin.String>
 
 [all super types]
-kotlin.collections.List<CapturedType(in kotlin/String)>
-kotlin.collections.MutableCollection<CapturedType(in kotlin/String)>
-kotlin.collections.Collection<CapturedType(in kotlin/String)>
-kotlin.collections.MutableIterable<CapturedType(in kotlin/String)>
-kotlin.collections.Iterable<CapturedType(in kotlin/String)>
+kotlin.collections.List<CapturedType(in kotlin.String)>
+kotlin.collections.MutableCollection<CapturedType(in kotlin.String)>
+kotlin.collections.Collection<CapturedType(in kotlin.String)>
+kotlin.collections.MutableIterable<CapturedType(in kotlin.String)>
+kotlin.collections.Iterable<CapturedType(in kotlin.String)>
 kotlin.Any
 
 [approximated all super types]
@@ -21,3 +21,4 @@ kotlin.collections.Collection<kotlin.Any?>
 kotlin.collections.MutableIterable<kotlin.Any?>
 kotlin.collections.Iterable<kotlin.Any?>
 kotlin.Any
+

analysis/analysis-api/testData/components/typeInfoProvider/superTypes/covariant.txt

@@ -1,17 +1,17 @@
 [direct super types]
-kotlin.collections.List<CapturedType(out kotlin/String)>
-kotlin.collections.MutableCollection<CapturedType(out kotlin/String)>
+kotlin.collections.List<CapturedType(out kotlin.String)>
+kotlin.collections.MutableCollection<CapturedType(out kotlin.String)>
 
 [approximated direct super types]
 kotlin.collections.List<kotlin.String>
 kotlin.collections.MutableCollection<out kotlin.String>
 
 [all super types]
-kotlin.collections.List<CapturedType(out kotlin/String)>
-kotlin.collections.MutableCollection<CapturedType(out kotlin/String)>
-kotlin.collections.Collection<CapturedType(out kotlin/String)>
-kotlin.collections.MutableIterable<CapturedType(out kotlin/String)>
-kotlin.collections.Iterable<CapturedType(out kotlin/String)>
+kotlin.collections.List<CapturedType(out kotlin.String)>
+kotlin.collections.MutableCollection<CapturedType(out kotlin.String)>
+kotlin.collections.Collection<CapturedType(out kotlin.String)>
+kotlin.collections.MutableIterable<CapturedType(out kotlin.String)>
+kotlin.collections.Iterable<CapturedType(out kotlin.String)>
 kotlin.Any
 
 [approximated all super types]
@@ -21,3 +21,4 @@ kotlin.collections.Collection<kotlin.String>
 kotlin.collections.MutableIterable<kotlin.String>
 kotlin.collections.Iterable<kotlin.String>
 kotlin.Any
+

analysis/analysis-api/testData/referenceResolve/JavaReference.descriptors.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in java.util) open class HashSet<E : kotlin.Any!> : java.util.AbstractSet<E!>, kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableSet<E>
+0: (in java.util) open class HashSet<E : kotlin.Any!> : java.util.AbstractSet<E!>(), kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableSet<E>

analysis/analysis-api/testData/referenceResolve/JavaReference.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in java.util) open class HashSet<E : kotlin.Any!> : java.util.AbstractSet<(E!!..E?)>, kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableSet<E>
+0: (in java.util) open class HashSet<E : kotlin.Any!> : java.util.AbstractSet<(E & kotlin.Any..E?)>(), kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableSet<E>

analysis/analysis-api/testData/referenceResolve/SamConstructor.descriptors.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in java.util) fun <T : kotlin.Any!> Comparator(function: (T!, T!) -> kotlin.Int): java.util.Comparator<T>
+0: (in java.util) <T : kotlin.Any!> Comparator(function: (T!, T!) -> kotlin.Int): java.util.Comparator<T>

analysis/analysis-api/testData/referenceResolve/SamConstructor.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in java.util) fun <T : kotlin.Any!> Comparator(function: ((T!!..T?), (T!!..T?)) -> kotlin.Int): java.util.Comparator<T>
+0: (in java.util) <T : kotlin.Any!> Comparator(function: ((T & kotlin.Any..T?), (T & kotlin.Any..T?)) -> kotlin.Int): java.util.Comparator<T>

analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.descriptors.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in java.util) fun <T : kotlin.Any!> Comparator(function: (T!, T!) -> kotlin.Int): java.util.Comparator<T>
+0: (in java.util) <T : kotlin.Any!> Comparator(function: (T!, T!) -> kotlin.Int): java.util.Comparator<T>

analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in java.util) fun <T : kotlin.Any!> Comparator(function: ((T!!..T?), (T!!..T?)) -> kotlin.Int): java.util.Comparator<T>
+0: (in java.util) <T : kotlin.Any!> Comparator(function: ((T & kotlin.Any..T?), (T & kotlin.Any..T?)) -> kotlin.Int): java.util.Comparator<T>

analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inStandardLibrary/notNull.descriptors.txt

@@ -0,0 +1,3 @@
+Resolved to:
+0: (in kotlin.properties.ReadWriteProperty) operator fun setValue(thisRef: T, property: kotlin.reflect.KProperty<*>, value: V)
+1: (in kotlin.properties.ReadWriteProperty) override operator fun getValue(thisRef: T, property: kotlin.reflect.KProperty<*>): V

analysis/analysis-api/testData/referenceResolve/forLoopIn/inBuiltIns/member.descriptors.txt

@@ -1,4 +1,4 @@
 Resolved to:
-0: (in kotlin.collections.IntIterator) operator fun next(): kotlin.Int
+0: (in kotlin.collections.IntIterator) override operator fun next(): kotlin.Int
 1: (in kotlin.collections.Iterator) operator fun hasNext(): kotlin.Boolean
-2: (in kotlin.ranges.IntProgression) operator fun iterator(): kotlin.collections.IntIterator
+2: (in kotlin.ranges.IntProgression) override operator fun iterator(): kotlin.collections.IntIterator

analysis/analysis-api/testData/referenceResolve/forLoopIn/inLibrary/extension.descriptors.txt

@@ -0,0 +1,4 @@
+Resolved to:
+0: (in kotlin.collections.CharIterator) override operator fun next(): kotlin.Char
+1: (in kotlin.collections.Iterator) operator fun hasNext(): kotlin.Boolean
+2: (in kotlin.text) operator fun kotlin.CharSequence.iterator(): kotlin.collections.CharIterator

analysis/analysis-api/testData/referenceResolve/inImport/javaClass.descriptors.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in java.util) open class HashMap<K : kotlin.Any!, V : kotlin.Any!> : java.util.AbstractMap<K!, V!>, kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableMap<K, V>
+0: (in java.util) open class HashMap<K : kotlin.Any!, V : kotlin.Any!> : java.util.AbstractMap<K!, V!>(), kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableMap<K, V>

analysis/analysis-api/testData/referenceResolve/inImport/javaClass.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in java.util) open class HashMap<K : kotlin.Any!, V : kotlin.Any!> : java.util.AbstractMap<(K!!..K?), (V!!..V?)>, kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableMap<K, V>
+0: (in java.util) open class HashMap<K : kotlin.Any!, V : kotlin.Any!> : java.util.AbstractMap<(K & kotlin.Any..K?), (V & kotlin.Any..V?)>(), kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableMap<K, V>

analysis/analysis-api/testData/referenceResolve/inImport/kotlinClass.txt

@@ -1,3 +1,3 @@
 Resolved to:
 0: (in kotlin.collections) inline fun <T> MutableList(size: kotlin.Int, init: (kotlin.Int) -> T): kotlin.collections.MutableList<T>
-1: (in kotlin.collections) interface MutableList<E> : kotlin.collections.List<E>, kotlin.collections.MutableCollection<E>
+1: (in kotlin.collections) interface MutableList<E> : kotlin.collections.List<E>, kotlin.collections.MutableCollection<E>

analysis/analysis-api/testData/referenceResolve/kDoc/qualified/stdlib/TopLevelClassFromStdlibByFullName.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in kotlin.collections) abstract class AbstractCollection<out E> : kotlin.collections.Collection<E>
+0: (in kotlin.collections) abstract class AbstractCollection<out E>protected constructor : kotlin.collections.Collection<E>

analysis/analysis-api/testData/referenceResolve/kDoc/qualified/stdlib/TopLevelClassFromStdlibByShortName.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in kotlin.collections) abstract class AbstractCollection<out E> : kotlin.collections.Collection<E>
+0: (in kotlin.collections) abstract class AbstractCollection<out E>protected constructor : kotlin.collections.Collection<E>

analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: T : A
+0: T

analysis/analysis-api/testData/referenceResolve/typeParameter/reified_extensionReceiver.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: reified T : kotlin.Any
+0: reified T

analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.descriptors.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in Controller) suspend fun suspendHere(x: ERROR_TYPE)
+0: (in Controller) suspend fun suspendHere(x: ERROR_TYPE(Unresolved type for Continuation<Unit>))

analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: (in Controller) suspend fun suspendHere(x: `Continuation<R|kotlin/Unit|>`)
+0: (in Controller) suspend fun suspendHere(x: ERROR_TYPE(Symbol not found for Continuation))

analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.pretty.txt

@@ -0,0 +1,2 @@
+val foo: kotlin.Int
+  get()

analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.pretty.txt

@@ -1,11 +1,11 @@
-open var kotlin.Int.zoo: kotlin.Unit
+var kotlin.Int.zoo: kotlin.Unit
 
-open fun foo()
+fun foo()
 
-open fun kotlin.Int.smth(): kotlin.Short
+fun kotlin.Int.smth(): kotlin.Short
 
-open val foo: kotlin.Int
+val foo: kotlin.Int
 
-open var bar: kotlin.Long
+var bar: kotlin.Long
 
-open val kotlin.Int.doo: kotlin.String
+val kotlin.Int.doo: kotlin.String

analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.descriptors.pretty.txt

@@ -0,0 +1 @@
+fun bar()

analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.pretty.txt

@@ -15,4 +15,4 @@ val name: kotlin.String
 
 val ordinal: kotlin.Int
 
-fun getDeclaringClass(): java.lang.Class<test.E!>!
+fun getDeclaringClass(): (java.lang.Class<test.E!>..java.lang.Class<test.E!>?)

analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.pretty.txt

@@ -2,11 +2,12 @@ private val value: kotlin.CharArray!
 
 private open var hash: kotlin.Int
 
-public/*package*/ open fun hash32(): kotlin.Int
+open fun hash32(): kotlin.Int
 
 private open var hash32: kotlin.Int
 
 open val length: kotlin.Int
+  get()
 
 open fun isEmpty(): kotlin.Boolean
 
@@ -18,7 +19,7 @@ open fun codePointCount(beginIndex: kotlin.Int, endIndex: kotlin.Int): kotlin.In
 
 open fun offsetByCodePoints(index: kotlin.Int, codePointOffset: kotlin.Int): kotlin.Int
 
-public/*package*/ open fun getChars(dst: kotlin.CharArray!, dstBegin: kotlin.Int)
+open fun getChars(dst: kotlin.CharArray!, dstBegin: kotlin.Int)
 
 open fun getChars(srcBegin: kotlin.Int, srcEnd: kotlin.Int, dst: kotlin.CharArray!, dstBegin: kotlin.Int)
 
@@ -95,9 +96,9 @@ open fun replaceFirst(regex: kotlin.String!, replacement: kotlin.String!): kotli
 
 open fun replaceAll(regex: kotlin.String!, replacement: kotlin.String!): kotlin.String!
 
-open fun split(regex: kotlin.String!, limit: kotlin.Int): kotlin.Array<(out) kotlin.String!>!
+open fun split(regex: kotlin.String!, limit: kotlin.Int): (kotlin.Array<kotlin.String!>..kotlin.Array<out kotlin.String!>?)
 
-open fun split(regex: kotlin.String!): kotlin.Array<(out) kotlin.String!>!
+open fun split(regex: kotlin.String!): (kotlin.Array<kotlin.String!>..kotlin.Array<out kotlin.String!>?)
 
 open fun toLowerCase(locale: java.util.Locale!): kotlin.String!
 
@@ -117,7 +118,7 @@ open fun intern(): kotlin.String!
 
 open operator fun get(index: kotlin.Int): kotlin.Char
 
-private open class CaseInsensitiveComparator : kotlin.Any, java.util.Comparator<kotlin.String!>, java.io.Serializable
+private open class CaseInsensitiveComparator : java.util.Comparator<kotlin.String!>, java.io.Serializable
 
 constructor()
 
@@ -151,7 +152,7 @@ constructor(buffer: java.lang.StringBuffer!)
 
 constructor(builder: java.lang.StringBuilder!)
 
-public/*package*/ constructor(value: kotlin.CharArray!, share: kotlin.Boolean)
+constructor(value: kotlin.CharArray!, share: kotlin.Boolean)
 
 @kotlin.Deprecated(message = "Deprecated in Java")
-public/*package*/ constructor(offset: kotlin.Int, count: kotlin.Int, value: kotlin.CharArray!)
+constructor(offset: kotlin.Int, count: kotlin.Int, value: kotlin.CharArray!)

analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt

@@ -3,6 +3,7 @@ val noGeneric: test.Foo?
 val withOuterGeneric: test.Foo?
 
 val <TT> TT.withOwnGeneric: TT?
+  get()
 
 val <TT> TT.withOuterAndOwnGeneric: test.Foo?
 
@@ -12,4 +13,4 @@ open fun hashCode(): kotlin.Int
 
 open fun toString(): kotlin.String
 
-constructor()
+constructor()

analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.pretty.txt

@@ -8,4 +8,4 @@ open fun hashCode(): kotlin.Int
 
 open fun toString(): kotlin.String
 
-inner constructor()
+constructor()

analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt

@@ -10,4 +10,4 @@ open fun hashCode(): kotlin.Int
 
 open fun toString(): kotlin.String
 
-inner constructor()
+constructor()

analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt

@@ -8,4 +8,4 @@ open fun hashCode(): kotlin.Int
 
 open fun toString(): kotlin.String
 
-inner constructor()
+constructor()

analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt

@@ -8,4 +8,4 @@ open fun hashCode(): kotlin.Int
 
 open fun toString(): kotlin.String
 
-inner constructor()
+constructor()

analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt

@@ -10,4 +10,4 @@ open fun hashCode(): kotlin.Int
 
 open fun toString(): kotlin.String
 
-inner constructor()
+constructor()

analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt

@@ -6,9 +6,9 @@ operator fun contains(p0: kotlin.Any!): kotlin.Boolean
 
 abstract operator fun iterator(): kotlin.collections.MutableIterator<test.SomeClass!>
 
-fun toArray(): kotlin.Array<(out) kotlin.Any!>!
+fun toArray(): (kotlin.Array<kotlin.Any!>..kotlin.Array<out kotlin.Any!>?)
 
-fun <T : kotlin.Any!> toArray(p0: kotlin.Array<(out) (T!!..T?)>!): kotlin.Array<(out) (T!!..T?)>!
+fun <T : kotlin.Any!> toArray(p0: (kotlin.Array<(T & kotlin.Any..T?)>..kotlin.Array<out (T & kotlin.Any..T?)>?)): (kotlin.Array<(T & kotlin.Any..T?)>..kotlin.Array<out (T & kotlin.Any..T?)>?)
 
 abstract fun add(p0: test.SomeClass!): kotlin.Boolean
 
@@ -30,4 +30,4 @@ open fun hashCode(): kotlin.Int
 
 open fun toString(): kotlin.String
 
-constructor()
+constructor()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.descriptors.pretty.txt

@@ -1 +0,0 @@
-object<LanguageVersionSettings>

analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt

@@ -1 +1 @@
-fun (@ReceiverTypeAnnotation kotlin.Int).foo()
+fun @ReceiverTypeAnnotation kotlin.Int.foo()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.pretty.txt

@@ -1,2 +1,6 @@
 @PropertyAnnotation
-var prop: kotlin.Int
+var prop: kotlin.Int
+  @GetAnnotation
+  get()
+  @SetAnnotation
+  set(@SetparamAnnotation value: kotlin.Int)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.pretty.txt

@@ -1,3 +1,7 @@
 @PropertyAnnotation
-@FieldAnnotation
-var prop: kotlin.Int
+@field:FieldAnnotation
+var prop: kotlin.Int
+  @GetAnnotation
+  get()
+  @SetAnnotation
+  set(@setparam:SetparamAnnotation value: kotlin.Int)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt

@@ -1,5 +1,5 @@
 @PropertyAnnotation
-@FieldAnnotation
+@field:FieldAnnotation
 var x: kotlin.Int
   @ExplicitGetAnnotation
   @GetAnnotation

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.pretty.txt

@@ -1,4 +1,5 @@
 @ExplicitPropertyAnnotation
-@DelegateAnnotation
+@delegate:DelegateAnnotation
 @PropertyAnnotation
-val lazyProperty: kotlin.Int
+val lazyProperty: kotlin.Int
+  get()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt

@@ -1 +1,2 @@
-val (@ReceiverTypeAnnotation kotlin.Long).prop: kotlin.Boolean
+val @ReceiverTypeAnnotation kotlin.Long.prop: kotlin.Boolean
+  get()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.pretty.txt

@@ -1 +1,2 @@
-val @ReceiverAnnotation @ReceiverTypeAnnotation kotlin.Long.prop: kotlin.Boolean
+val @ReceiverAnnotation @ReceiverTypeAnnotation kotlin.Long.prop: kotlin.Boolean
+  get()

analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.descriptors.pretty.txt

@@ -1 +0,0 @@
-class String : java.io.Serializable, kotlin.Comparable<kotlin.String!>, kotlin.CharSequence

analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.pretty.txt

@@ -1 +1 @@
-class String : kotlin.Any, java.io.Serializable, kotlin.Comparable<kotlin.String!>, kotlin.CharSequence
+class String : java.io.Serializable, kotlin.Comparable<kotlin.String!>, kotlin.CharSequence

analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.descriptors.pretty.txt

@@ -1,2 +1,2 @@
-@ERROR
+@`<Error class: unknown class>`
 class MyClass

analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.pretty.txt

@@ -1,2 +1,2 @@
 @org.jetbrains.kotlin.fir.plugin.MyInterfaceSupertype
-class MyClass : kotlin.Any, foo.MyInterface
+class MyClass : foo.MyInterface

analysis/analysis-api/testData/symbols/symbolByPsi/annotations.pretty.txt

@@ -1,6 +1,4 @@
-annotation class Anno {
-  constructor(param1: kotlin.String, param2: kotlin.Int)
-
+annotation class Anno(param1: kotlin.String, param2: kotlin.Int) {
   val param1: kotlin.String
 
   val param2: kotlin.Int

analysis/analysis-api/testData/symbols/symbolByPsi/backingField.pretty.txt

@@ -1 +1,3 @@
-var p: kotlin.Int
+var p: kotlin.Int
+  get()
+  set(value: kotlin.Int)

analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt

@@ -57,7 +57,7 @@ KtClassInitializerSymbol:
   origin: SOURCE
   symbolKind: CLASS_MEMBER
   typeParameters: []
-  getContainingModule: Could not render due to org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments: Unexpected KtSymbol KtFe10PsiClassInitializerSymbol
+  getContainingModule: Could not render due to java.lang.StackOverflowError
 
   deprecationStatus: null
 

analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.pretty.txt

@@ -1,5 +1,3 @@
-class A {
-  constructor(a: kotlin.Int, b: kotlin.String)
-
+class A(a: kotlin.Int, b: kotlin.String) {
   val a: kotlin.Int
 }

analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.pretty.txt

@@ -1 +1 @@
-class A<@org.jetbrains.annotations.NotNull T, R>
+class A<T, R>

analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt

@@ -7,9 +7,7 @@ KtTypeParameterSymbol:
   name: T
   origin: SOURCE
   typeParameters: []
-  upperBounds: [
-    kotlin/Any?
-  ]
+  upperBounds: []
   variance: INVARIANT
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
@@ -20,9 +18,7 @@ KtTypeParameterSymbol:
   name: R
   origin: SOURCE
   typeParameters: []
-  upperBounds: [
-    kotlin/Any?
-  ]
+  upperBounds: []
   variance: INVARIANT
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.pretty.txt

@@ -1 +1,2 @@
 val y: kotlin.Int
+  get()

analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.pretty.txt

@@ -1,6 +1,4 @@
-class MyColor {
-  constructor(x: kotlin.Int, y: kotlin.Int, z: kotlin.Int)
-
+class MyColor(x: kotlin.Int, y: kotlin.Int, z: kotlin.Int) {
   val x: kotlin.Int
 
   val y: kotlin.Int
@@ -10,6 +8,7 @@ class MyColor {
 
 class Some {
   val delegate: MyColor
+    get()
 
   val lambda: kotlin.Lazy<MyColor>
 

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.pretty.txt

@@ -6,7 +6,6 @@ val i2: kotlin.Int
   get()
 
 var i3: kotlin.Int
-  get()
   @kotlin.Deprecated(message = "don't use getter of i3")
   set(value: kotlin.Int)
 
@@ -19,10 +18,10 @@ var i4: kotlin.Int
 @kotlin.Deprecated(message = "don't use f")
 fun f(): kotlin.Int
 
-@kotlin.Deprecated(level = kotlin.DeprecationLevel.ERROR, message = "don't use j")
+@kotlin.Deprecated(message = "don't use j", level = kotlin.DeprecationLevel.ERROR)
 val j: kotlin.Int
 
-@kotlin.Deprecated(level = kotlin.DeprecationLevel.HIDDEN, message = "don't use j2")
+@kotlin.Deprecated(message = "don't use j2", level = kotlin.DeprecationLevel.HIDDEN)
 val j2: kotlin.Int
 
 val j2: kotlin.Int

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.pretty.txt

@@ -18,10 +18,10 @@ var i4: kotlin.Int
 @kotlin.Deprecated(message = "don't use f")
 fun f(): kotlin.Int
 
-@kotlin.Deprecated(level = kotlin.DeprecationLevel.ERROR, message = "don't use j")
+@kotlin.Deprecated(message = "don't use j", level = kotlin.DeprecationLevel.ERROR)
 val j: kotlin.Int
 
-@kotlin.Deprecated(level = kotlin.DeprecationLevel.HIDDEN, message = "don't use j2")
+@kotlin.Deprecated(message = "don't use j2", level = kotlin.DeprecationLevel.HIDDEN)
 val j2: kotlin.Int
 
 @java.lang.Deprecated

analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.pretty.txt

@@ -1,9 +0,0 @@
-fun destruct(): kotlin.Int
-
-data class P {
-  constructor(x: kotlin.Int, y: kotlin.Int)
-
-  val x: kotlin.Int
-
-  val y: kotlin.Int
-}

analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.pretty.txt

@@ -1,15 +1,7 @@
 fun destruct(): kotlin.Int
 
-class P {
-  constructor(x: kotlin.Int, y: kotlin.Int)
-
+data class P(x: kotlin.Int, y: kotlin.Int) {
   val x: kotlin.Int
 
   val y: kotlin.Int
-
-  operator fun component1(): kotlin.Int
-
-  operator fun component2(): kotlin.Int
-
-  fun copy(x: kotlin.Int = ..., y: kotlin.Int = ...): P
 }

analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.pretty.txt

@@ -1,5 +1,11 @@
 enum class MyEnumClass {
-  FirstEntry,
+  FirstEntry {
+    fun a()
+  },
   SecondEntry,
-  ThirdEntry
+  ThirdEntry {
+    fun one()
+
+    fun one(i: kotlin.Int)
+  }
 }

analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.descriptors.pretty.txt

@@ -1,7 +1,20 @@
 enum class MyEnumClass {
-  FirstEntry,
-  SecondEntry,
-  ThirdEntry;
+  FirstEntry {
+    fun a()
+
+    override fun foo()
+  },
+  SecondEntry {
+    override fun foo()
+
+    override val i: kotlin.Int
+      get()
+  },
+  ThirdEntry {
+    override fun foo()
+
+    override fun foo(i: kotlin.Int)
+  };
 
   abstract fun foo()
 

analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.pretty.txt

@@ -1,7 +1,20 @@
 enum class MyEnumClass {
-  FirstEntry,
-  SecondEntry,
-  ThirdEntry;
+  FirstEntry {
+    fun a()
+
+    override fun foo()
+  },
+  SecondEntry {
+    override fun foo()
+
+    override val i: kotlin.Int
+      get()
+  },
+  ThirdEntry {
+    override fun foo()
+
+    override fun foo(i: kotlin.Int)
+  };
 
   abstract fun foo()