FIR: add class type parameters to constructors & change their rendering

compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt

@@ -104,12 +104,13 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
             convert()
 
         private fun KtDeclaration.toFirDeclaration(
-            delegatedSuperType: FirTypeRef?, delegatedSelfType: FirTypeRef, hasPrimaryConstructor: Boolean
+            delegatedSuperType: FirTypeRef?, delegatedSelfType: FirTypeRef, owner: KtClassOrObject, hasPrimaryConstructor: Boolean
         ): FirDeclaration {
             return when (this) {
                 is KtSecondaryConstructor -> toFirConstructor(
                     delegatedSuperType,
                     delegatedSelfType,
+                    owner,
                     hasPrimaryConstructor
                 )
                 else -> convert<FirDeclaration>()
@@ -402,6 +403,7 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
                 firDelegatedCall
             )
             this?.extractAnnotationsTo(firConstructor)
+            owner.extractTypeParametersTo(firConstructor)
             this?.extractValueParametersTo(firConstructor)
             return firConstructor
         }
@@ -464,7 +466,7 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
                 val delegatedSuperType = enumEntry.extractSuperTypeListEntriesTo(firEnumEntry, delegatedSelfType)
                 for (declaration in enumEntry.declarations) {
                     firEnumEntry.declarations += declaration.toFirDeclaration(
-                        delegatedSuperType, delegatedSelfType, hasPrimaryConstructor = true
+                        delegatedSuperType, delegatedSelfType, enumEntry, hasPrimaryConstructor = true
                     )
                 }
                 firEnumEntry
@@ -537,7 +539,7 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
 
                 for (declaration in classOrObject.declarations) {
                     firClass.declarations += declaration.toFirDeclaration(
-                        delegatedSuperType, delegatedSelfType, hasPrimaryConstructor = primaryConstructor != null
+                        delegatedSuperType, delegatedSelfType, classOrObject, hasPrimaryConstructor = primaryConstructor != null
                     )
                 }
 
@@ -554,7 +556,8 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
 
                 for (declaration in objectDeclaration.declarations) {
                     declarations += declaration.toFirDeclaration(
-                        delegatedSuperType = null, delegatedSelfType = delegatedSelfType, hasPrimaryConstructor = false
+                        delegatedSuperType = null, delegatedSelfType = delegatedSelfType,
+                        owner = objectDeclaration, hasPrimaryConstructor = false
                     )
                 }
             }
@@ -687,6 +690,7 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
         private fun KtSecondaryConstructor.toFirConstructor(
             delegatedSuperTypeRef: FirTypeRef?,
             delegatedSelfTypeRef: FirTypeRef,
+            owner: KtClassOrObject,
             hasPrimaryConstructor: Boolean
         ): FirConstructor {
             val firConstructor = FirConstructorImpl(
@@ -701,6 +705,7 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
             )
             firFunctions += firConstructor
             extractAnnotationsTo(firConstructor)
+            owner.extractTypeParametersTo(firConstructor)
             extractValueParametersTo(firConstructor)
             firConstructor.body = buildFirBody()
             firFunctions.removeLast()

compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt

@@ -1,9 +1,13 @@
 FILE: F.kt
     public? open class A : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|A| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? class B : A {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|B| {
+            super<kotlin/Any>()
+        }
 
     }

compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt

@@ -1,19 +1,27 @@
 FILE: NestedOfAliasedType.kt
     public? abstract class A : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|A| {
+            super<kotlin/Any>()
+        }
 
         public? abstract class Nested : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor(): R|A.Nested| {
+                super<kotlin/Any>()
+            }
 
         }
 
     }
     public? final typealias TA = A
     public? final? class B : TA {
-        public? constructor(): super<TA>()
+        public? constructor(): R|B| {
+            super<TA>()
+        }
 
         public? final? class NestedInB : Nested {
-            public? constructor(): super<Nested>()
+            public? constructor(): R|B.NestedInB| {
+                super<Nested>()
+            }
 
         }
 

compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt

@@ -1,12 +1,18 @@
 FILE: NestedSuperType.kt
     public? abstract class My : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|p/My| {
+            super<kotlin/Any>()
+        }
 
         public? abstract class NestedOne : My {
-            public? constructor(): super<My>()
+            public? constructor(): R|p/My.NestedOne| {
+                super<My>()
+            }
 
             public? abstract class NestedTwo : NestedOne {
-                public? constructor(): super<NestedOne>()
+                public? constructor(): R|p/My.NestedOne.NestedTwo| {
+                    super<NestedOne>()
+                }
 
             }
 
@@ -14,10 +20,14 @@ FILE: NestedSuperType.kt
 
     }
     public? final? class Your : My {
-        public? constructor(): super<My>()
+        public? constructor(): R|p/Your| {
+            super<My>()
+        }
 
         public? final? class NestedThree : NestedOne {
-            public? constructor(): super<NestedOne>()
+            public? constructor(): R|p/Your.NestedThree| {
+                super<NestedOne>()
+            }
 
         }
 

compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt

@@ -1,9 +1,13 @@
 FILE: complexTypes.kt
     <T, out S> public? final? class C : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor<T, out S>(): R|a/b/C<T, S>| {
+            super<kotlin/Any>()
+        }
 
         <R, in P> public? final? inner class D : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor<R, in P>(): R|a/b/C.D<R, P>| {
+                super<kotlin/Any>()
+            }
 
         }
 

compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt

@@ -1,13 +1,17 @@
 FILE: derivedClass.kt
     <T> public? open class Base : kotlin/Any {
-        public? constructor(x: T): super<kotlin/Any>()
+        public? constructor<T>(x: T): R|Base<T>| {
+            super<kotlin/Any>()
+        }
 
         public? final? val x: T = R|<local>/x|
             public? get(): T
 
     }
     <T : Any> public? final? class Derived : Base<T> {
-        public? constructor(x: T): super<Base<T>>(x#)
+        public? constructor<T : Any>(x: T): R|Derived<T>| {
+            super<Base<T>>(x#)
+        }
 
     }
     <T : Any> public? final? fun create(x: T): Derived<T> {

compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt

@@ -1,25 +1,35 @@
 FILE: enums.kt
     public? final? enum class Order : kotlin/Enum {
-        private constructor(): super<kotlin/Enum>()
+        private constructor(): R|Order| {
+            super<kotlin/Enum>()
+        }
 
         public? final enum entry FIRST : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor(): R|Order.FIRST| {
+                super<kotlin/Any>()
+            }
 
         }
 
         public? final enum entry SECOND : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor(): R|Order.SECOND| {
+                super<kotlin/Any>()
+            }
 
         }
 
         public? final enum entry THIRD : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor(): R|Order.THIRD| {
+                super<kotlin/Any>()
+            }
 
         }
 
     }
     public? final? enum class Planet : kotlin/Enum {
-        public? constructor(m: Double, r: Double): super<kotlin/Enum>()
+        public? constructor(m: Double, r: Double): R|Planet| {
+            super<kotlin/Enum>()
+        }
 
         public? final? val m: Double = R|<local>/m|
             public? get(): Double
@@ -28,7 +38,9 @@ FILE: enums.kt
             internal get(): Double
 
         public? final enum entry MERCURY : Planet {
-            public? constructor(): super<Planet>(Double(1.0), Double(2.0))
+            public? constructor(): R|Planet.MERCURY| {
+                super<Planet>(Double(1.0), Double(2.0))
+            }
 
             public? open? override fun sayHello(): kotlin/Unit {
                 println#(String(Hello!!!))
@@ -37,7 +49,9 @@ FILE: enums.kt
         }
 
         public? final enum entry VENERA : Planet {
-            public? constructor(): super<Planet>(Double(3.0), Double(4.0))
+            public? constructor(): R|Planet.VENERA| {
+                super<Planet>(Double(3.0), Double(4.0))
+            }
 
             public? open? override fun sayHello(): kotlin/Unit {
                 println#(String(Ola!!!))
@@ -46,7 +60,9 @@ FILE: enums.kt
         }
 
         public? final enum entry EARTH : Planet {
-            public? constructor(): super<Planet>(Double(5.0), Double(6.0))
+            public? constructor(): R|Planet.EARTH| {
+                super<Planet>(Double(5.0), Double(6.0))
+            }
 
             public? open? override fun sayHello(): kotlin/Unit {
                 println#(String(Privet!!!))
@@ -60,7 +76,9 @@ FILE: enums.kt
         public? abstract fun sayHello(): kotlin/Unit
 
         public? final? companion object Companion : kotlin/Any {
-            private constructor(): super<kotlin/Any>()
+            private constructor(): R|Planet.Companion| {
+                super<kotlin/Any>()
+            }
 
             public? final? const val G: <implicit> = Double(6.67E-11)
                 public? get(): <implicit>

compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt

@@ -2,21 +2,29 @@ FILE: enums2.kt
     public? final? interface Some : kotlin/Any {
     }
     public? final? object O1 : Some {
-        private constructor(): super<kotlin/Any>()
+        private constructor(): R|O1| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? object O2 : Some {
-        private constructor(): super<kotlin/Any>()
+        private constructor(): R|O2| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? enum class SomeEnum : kotlin/Enum {
-        public? constructor(x: Some): super<kotlin/Enum>()
+        public? constructor(x: Some): R|SomeEnum| {
+            super<kotlin/Enum>()
+        }
 
         public? final? val x: Some = R|<local>/x|
             public? get(): Some
 
         public? final enum entry FIRST : SomeEnum {
-            public? constructor(): super<SomeEnum>(O1#)
+            public? constructor(): R|SomeEnum.FIRST| {
+                super<SomeEnum>(O1#)
+            }
 
             public? open? override fun check(y: Some): Boolean {
                 ^check Boolean(true)
@@ -25,7 +33,9 @@ FILE: enums2.kt
         }
 
         public? final enum entry SECOND : SomeEnum {
-            public? constructor(): super<SomeEnum>(O2#)
+            public? constructor(): R|SomeEnum.SECOND| {
+                super<SomeEnum>(O2#)
+            }
 
             public? open? override fun check(y: Some): Boolean {
                 ^check ==(y#, O2#)

compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt

@@ -1,13 +1,17 @@
 FILE: expectActual.kt
     public? final? expect class MyClass : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|MyClass| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? expect fun foo(): String
     public? final? expect val x: Int
         public? get(): Int
     public? final? actual class MyClass : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|MyClass| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? actual fun foo(): <implicit> {

compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt

@@ -5,7 +5,9 @@ FILE: genericFunctions.kt
         ^safeAs (this# as? T)
     }
     public? abstract class Summator : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Summator| {
+            super<kotlin/Any>()
+        }
 
         <T> public? abstract fun plus(first: T, second: T): T
 

compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt

@@ -1,21 +1,29 @@
 FILE: nestedClass.kt
     public? abstract class Base : kotlin/Any {
-        public? constructor(s: String): super<kotlin/Any>()
+        public? constructor(s: String): R|Base| {
+            super<kotlin/Any>()
+        }
 
         public? final? val s: String = R|<local>/s|
             public? get(): String
 
     }
     public? final? class Outer : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Outer| {
+            super<kotlin/Any>()
+        }
 
         public? final? class Derived : Base {
-            public? constructor(s: String): super<Base>(s#)
+            public? constructor(s: String): R|Outer.Derived| {
+                super<Base>(s#)
+            }
 
         }
 
         public? final? object Obj : Base {
-            private constructor(): super<Base>(String())
+            private constructor(): R|Outer.Obj| {
+                super<Base>(String())
+            }
 
         }
 

compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt

@@ -3,10 +3,13 @@ FILE: noPrimaryConstructor.kt
         public? final? val x: String
             public? get(): String
 
-        public? constructor(x: String): super<kotlin/Any>() {
+        public? constructor(x: String): R|NoPrimary| {
+            super<kotlin/Any>()
             this#.x# = x#
         }
 
-        public? constructor(): this<R|NoPrimary|>(String())
+        public? constructor(): R|NoPrimary| {
+            this<R|NoPrimary|>(String())
+        }
 
     }

compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt

@@ -7,7 +7,9 @@ FILE: simpleClass.kt
 
     }
     public? final? class SomeClass : SomeInterface {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|SomeClass| {
+            super<kotlin/Any>()
+        }
 
         private final? val baz: <implicit> = Int(42)
             private get(): <implicit>
@@ -29,6 +31,8 @@ FILE: simpleClass.kt
 
     }
     public? final? inline class InlineClass : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|InlineClass| {
+            super<kotlin/Any>()
+        }
 
     }

compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt

@@ -3,6 +3,8 @@ FILE: simpleTypeAlias.kt
     }
     public? final typealias C = B
     public? final? class D : C {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|D| {
+            super<kotlin/Any>()
+        }
 
     }

compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt

@@ -1,12 +1,16 @@
 FILE: typeAliasWithGeneric.kt
     public? open class A : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|A| {
+            super<kotlin/Any>()
+        }
 
     }
     <S, T : A> public? final? interface B : kotlin/Any {
     }
     <T> public? final typealias C = B<T, A>
     public? final? class D : C<A> {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|D| {
+            super<kotlin/Any>()
+        }
 
     }

compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt

@@ -2,10 +2,14 @@ FILE: typeParameterVsNested.kt
     public? final? interface Some : kotlin/Any {
     }
     <T : Some> public? abstract class My : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor<T : Some>(): R|test/My<T>| {
+            super<kotlin/Any>()
+        }
 
         public? final? inner class T : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor(): R|test/My.T| {
+                super<kotlin/Any>()
+            }
 
         }
 
@@ -21,7 +25,9 @@ FILE: typeParameterVsNested.kt
             public? get(): test.My.T
 
         public? final? class Some : T {
-            public? constructor(): super<T>()
+            public? constructor(): R|test/My.Some| {
+                super<T>()
+            }
 
         }
 

compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt

@@ -8,11 +8,15 @@ FILE: typeParameters.kt
     public? final typealias StringList = List<out String>
     public? final typealias AnyList = List<*>
     <out T : Any> public? abstract class AbstractList : List<T> {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor<out T : Any>(): R|AbstractList<T>| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? class SomeList : AbstractList<Int> {
-        public? constructor(): super<AbstractList<Int>>()
+        public? constructor(): R|SomeList| {
+            super<AbstractList<Int>>()
+        }
 
         public? open? override fun get(index: Int): Int {
             ^get Int(42)

compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt

@@ -4,6 +4,8 @@ FILE: where.kt
     public? final? interface B : kotlin/Any {
     }
     <T : A, B> public? final? class C : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor<T : A, B>(): R|C<T>| {
+            super<kotlin/Any>()
+        }
 
     }

compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt

@@ -1,6 +1,8 @@
 FILE: annotated.kt
     @Target(AnnotationTarget#.EXPRESSION#) @Retention(AnnotationRetention#.SOURCE#) public? final? annotation class Ann : kotlin/Annotation {
-        public? constructor(): super<kotlin/Annotation>()
+        public? constructor(): R|Ann| {
+            super<kotlin/Annotation>()
+        }
 
     }
     public? final? fun foo(arg: Int): Int {
@@ -23,7 +25,9 @@ FILE: annotated.kt
         ^foo Int(42)
     }
     public? final? data class Two : kotlin/Any {
-        public? constructor(x: Int, y: Int): super<kotlin/Any>()
+        public? constructor(x: Int, y: Int): R|Two| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? fun bar(two: Two): kotlin/Unit {

compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt

@@ -5,7 +5,9 @@ FILE: arrayAccess.kt
         ^foo Int(1)
     }
     public? final? class Wrapper : kotlin/Any {
-        public? constructor(v: IntArray): super<kotlin/Any>()
+        public? constructor(v: IntArray): R|Wrapper| {
+            super<kotlin/Any>()
+        }
 
         public? final? val v: IntArray = R|<local>/v|
             public? get(): IntArray

compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt

@@ -1,6 +1,8 @@
 FILE: callableReferences.kt
     public? final? class A : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|A| {
+            super<kotlin/Any>()
+        }
 
         public? final? fun foo(): kotlin/Unit {
         }

compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt

@@ -9,7 +9,9 @@ FILE: calls.kt
         ^testRegular distance#(Int(3), Int(4))
     }
     public? final? class My : kotlin/Any {
-        public? constructor(x: Int): super<kotlin/Any>()
+        public? constructor(x: Int): R|My| {
+            super<kotlin/Any>()
+        }
 
         public? final? var x: Int = R|<local>/x|
             public? get(): Int

compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt

@@ -1,6 +1,8 @@
 FILE: classReference.kt
     public? final? class A : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|test/A| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? fun test(): kotlin/Unit {

compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt

@@ -1,38 +1,52 @@
 FILE: collectionLiterals.kt
     public? final? annotation class Ann1 : kotlin/Annotation {
-        public? constructor(arr: IntArray): super<kotlin/Annotation>()
+        public? constructor(arr: IntArray): R|Ann1| {
+            super<kotlin/Annotation>()
+        }
 
         public? final? val arr: IntArray = R|<local>/arr|
             public? get(): IntArray
 
     }
     public? final? annotation class Ann2 : kotlin/Annotation {
-        public? constructor(arr: DoubleArray): super<kotlin/Annotation>()
+        public? constructor(arr: DoubleArray): R|Ann2| {
+            super<kotlin/Annotation>()
+        }
 
         public? final? val arr: DoubleArray = R|<local>/arr|
             public? get(): DoubleArray
 
     }
     public? final? annotation class Ann3 : kotlin/Annotation {
-        public? constructor(arr: Array<String>): super<kotlin/Annotation>()
+        public? constructor(arr: Array<String>): R|Ann3| {
+            super<kotlin/Annotation>()
+        }
 
         public? final? val arr: Array<String> = R|<local>/arr|
             public? get(): Array<String>
 
     }
     @Ann1(<implicitArrayOf>()) @Ann2(<implicitArrayOf>()) @Ann3(<implicitArrayOf>()) public? final? class Zero : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Zero| {
+            super<kotlin/Any>()
+        }
 
     }
     @Ann1(<implicitArrayOf>(Int(1), Int(2))) public? final? class First : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|First| {
+            super<kotlin/Any>()
+        }
 
     }
     @Ann2(<implicitArrayOf>(Double(3.14))) public? final? class Second : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Second| {
+            super<kotlin/Any>()
+        }
 
     }
     @Ann3(<implicitArrayOf>(String(Alpha), String(Omega))) public? final? class Third : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Third| {
+            super<kotlin/Any>()
+        }
 
     }

compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt

@@ -1,6 +1,8 @@
 FILE: destructuring.kt
     public? final? data class Some : kotlin/Any {
-        public? constructor(first: Int, second: Double, third: String): super<kotlin/Any>()
+        public? constructor(first: Int, second: Double, third: String): R|Some| {
+            super<kotlin/Any>()
+        }
 
         public? final? val first: Int = R|<local>/first|
             public? get(): Int

compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt

@@ -25,7 +25,9 @@ FILE: for.kt
 
     }
     public? final? data class Some : kotlin/Any {
-        public? constructor(x: Int, y: Int): super<kotlin/Any>()
+        public? constructor(x: Int, y: Int): R|Some| {
+            super<kotlin/Any>()
+        }
 
         public? final? val x: Int = R|<local>/x|
             public? get(): Int

compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt

@@ -1,6 +1,8 @@
 FILE: init.kt
     public? final? class WithInit : kotlin/Any {
-        public? constructor(x: Int): super<kotlin/Any>()
+        public? constructor(x: Int): R|WithInit| {
+            super<kotlin/Any>()
+        }
 
         public? final? val x: Int
             public? get(): Int

compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt

@@ -1,6 +1,8 @@
 FILE: lambda.kt
     public? final? data class Tuple : kotlin/Any {
-        public? constructor(x: Int, y: Int): super<kotlin/Any>()
+        public? constructor(x: Int, y: Int): R|Tuple| {
+            super<kotlin/Any>()
+        }
 
         public? final? val x: Int = R|<local>/x|
             public? get(): Int

compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt

@@ -1,7 +1,9 @@
 FILE: locals.kt
     public? final? fun withLocals(p: Int): Int {
         local final? class Local : kotlin/Any {
-            public? constructor(pp: Int): super<kotlin/Any>()
+            public? constructor(pp: Int): R|Local| {
+                super<kotlin/Any>()
+            }
 
             public? final? val pp: Int = R|<local>/pp|
                 public? get(): Int
@@ -18,7 +20,9 @@ FILE: locals.kt
         }
 
         lval code: <implicit> = object : Any {
-            private constructor(): super<Any>()
+            private constructor(): <no name provided> {
+                super<Any>()
+            }
 
             public? final? fun foo(): <implicit> {
                 ^foo hashCode#()

compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt

@@ -13,7 +13,9 @@ FILE: super.kt
 
     }
     public? final? class C : A, B {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|C| {
+            super<kotlin/Any>()
+        }
 
         public? open? override fun bar(): kotlin/Unit {
             super<<implicit>>.bar#()

compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt

@@ -1,6 +1,8 @@
 FILE: these.kt
     public? final? class Some : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Some| {
+            super<kotlin/Any>()
+        }
 
         public? final? fun foo(): Int {
             ^foo Int(1)

compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt

@@ -35,7 +35,9 @@ FILE: unary.kt
 
     }
     public? final? class X : kotlin/Any {
-        public? constructor(i: Int): super<kotlin/Any>()
+        public? constructor(i: Int): R|X| {
+            super<kotlin/Any>()
+        }
 
         public? final? val i: Int = R|<local>/i|
             public? get(): Int
@@ -72,7 +74,9 @@ FILE: unary.kt
 
     }
     public? final? class Y : kotlin/Any {
-        public? constructor(arr: Array<Int>): super<kotlin/Any>()
+        public? constructor(arr: Array<Int>): R|Y| {
+            super<kotlin/Any>()
+        }
 
         public? final? val arr: Array<Int> = R|<local>/arr|
             public? get(): Array<Int>

compiler/fir/resolve/testData/builtIns/kotlin-collections.txt

@@ -3,7 +3,7 @@ public abstract class BooleanIterator : R|kotlin/collections/Iterator<kotlin/Boo
 
     public abstract fun nextBoolean(): R|kotlin/Boolean|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/BooleanIterator|
 
 }
 
@@ -12,7 +12,7 @@ public abstract class ByteIterator : R|kotlin/collections/Iterator<kotlin/Byte>|
 
     public abstract fun nextByte(): R|kotlin/Byte|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/ByteIterator|
 
 }
 
@@ -21,7 +21,7 @@ public abstract class CharIterator : R|kotlin/collections/Iterator<kotlin/Char>|
 
     public abstract fun nextChar(): R|kotlin/Char|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/CharIterator|
 
 }
 
@@ -41,7 +41,7 @@ public abstract class DoubleIterator : R|kotlin/collections/Iterator<kotlin/Doub
 
     public abstract fun nextDouble(): R|kotlin/Double|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/DoubleIterator|
 
 }
 
@@ -50,7 +50,7 @@ public abstract class FloatIterator : R|kotlin/collections/Iterator<kotlin/Float
 
     public abstract fun nextFloat(): R|kotlin/Float|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/FloatIterator|
 
 }
 
@@ -59,7 +59,7 @@ public abstract class IntIterator : R|kotlin/collections/Iterator<kotlin/Int>| {
 
     public abstract fun nextInt(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/IntIterator|
 
 }
 
@@ -118,7 +118,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 
     public abstract fun nextLong(): R|kotlin/Long|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/LongIterator|
 
 }
 
@@ -258,7 +258,6 @@ public abstract class ShortIterator : R|kotlin/collections/Iterator<kotlin/Short
 
     public abstract fun nextShort(): R|kotlin/Short|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/ShortIterator|
 
 }
-

compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt

@@ -9,12 +9,12 @@ public open class CharProgression : R|kotlin/collections/Iterable<kotlin/Char>|
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|, step: R|kotlin/Int|)
+    internal constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgression|
 
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Char|, rangeEnd: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgression|
 
-        private constructor()
+        private constructor(): R|kotlin/ranges/CharProgression.Companion|
 
     }
 
@@ -25,7 +25,7 @@ internal final class CharProgressionIterator : R|kotlin/collections/CharIterator
 
     public open fun nextChar(): R|kotlin/Char|
 
-    public constructor(first: R|kotlin/Char|, last: R|kotlin/Char|, step: R|kotlin/Int|)
+    public constructor(first: R|kotlin/Char|, last: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgressionIterator|
 
 }
 
@@ -40,10 +40,10 @@ public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|)
+    public constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|): R|kotlin/ranges/CharRange|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/ranges/CharRange.Companion|
 
     }
 
@@ -67,12 +67,12 @@ public open class IntProgression : R|kotlin/collections/Iterable<kotlin/Int>| {
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|, step: R|kotlin/Int|)
+    internal constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgression|
 
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Int|, rangeEnd: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgression|
 
-        private constructor()
+        private constructor(): R|kotlin/ranges/IntProgression.Companion|
 
     }
 
@@ -83,7 +83,7 @@ internal final class IntProgressionIterator : R|kotlin/collections/IntIterator|
 
     public open fun nextInt(): R|kotlin/Int|
 
-    public constructor(first: R|kotlin/Int|, last: R|kotlin/Int|, step: R|kotlin/Int|)
+    public constructor(first: R|kotlin/Int|, last: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgressionIterator|
 
 }
 
@@ -98,10 +98,10 @@ public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/C
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|)
+    public constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|): R|kotlin/ranges/IntRange|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/ranges/IntRange.Companion|
 
     }
 
@@ -118,12 +118,12 @@ public open class LongProgression : R|kotlin/collections/Iterable<kotlin/Long>|
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|, step: R|kotlin/Long|)
+    internal constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgression|
 
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Long|, rangeEnd: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgression|
 
-        private constructor()
+        private constructor(): R|kotlin/ranges/LongProgression.Companion|
 
     }
 
@@ -134,7 +134,7 @@ internal final class LongProgressionIterator : R|kotlin/collections/LongIterator
 
     public open fun nextLong(): R|kotlin/Long|
 
-    public constructor(first: R|kotlin/Long|, last: R|kotlin/Long|, step: R|kotlin/Long|)
+    public constructor(first: R|kotlin/Long|, last: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgressionIterator|
 
 }
 
@@ -149,12 +149,11 @@ public final class LongRange : R|kotlin/ranges/LongProgression|, R|kotlin/ranges
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|)
+    public constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|): R|kotlin/ranges/LongRange|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/ranges/LongRange.Companion|
 
     }
 
 }
-

compiler/fir/resolve/testData/builtIns/kotlin.txt

@@ -38,7 +38,7 @@ public open class Any {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor()
+    public constructor(): R|kotlin/Any|
 
 }
 
@@ -49,7 +49,7 @@ public open class Any {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|T|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, T>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, T>|): R|kotlin/Array<T>|
 
 }
 
@@ -64,10 +64,10 @@ public final class Boolean : R|kotlin/Comparable<kotlin/Boolean>| {
 
     public final infix fun xor(other: R|kotlin/Boolean|): R|kotlin/Boolean|
 
-    private constructor()
+    private constructor(): R|kotlin/Boolean|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Boolean.Companion|
 
     }
 
@@ -80,9 +80,9 @@ public final class BooleanArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Boolean|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>|): R|kotlin/BooleanArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/BooleanArray|
 
 }
 
@@ -201,10 +201,10 @@ public final class Byte : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Byte>| {
 
     public final operator fun unaryPlus(): R|kotlin/Int|
 
-    private constructor()
+    private constructor(): R|kotlin/Byte|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Byte.Companion|
 
     }
 
@@ -217,9 +217,9 @@ public final class ByteArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Byte|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Byte>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Byte>|): R|kotlin/ByteArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/ByteArray|
 
 }
 
@@ -252,10 +252,10 @@ public final class Char : R|kotlin/Comparable<kotlin/Char>| {
 
     public final fun toShort(): R|kotlin/Short|
 
-    private constructor()
+    private constructor(): R|kotlin/Char|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Char.Companion|
 
     }
 
@@ -268,9 +268,9 @@ public final class CharArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Char|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Char>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Char>|): R|kotlin/CharArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/CharArray|
 
 }
 
@@ -292,12 +292,12 @@ public abstract interface Cloneable : R|kotlin/Any| {
 }
 
 public final annotation class Deprecated : R|kotlin/Annotation| {
-    public constructor(message: R|kotlin/String|, replaceWith: R|kotlin/ReplaceWith|, level: R|kotlin/DeprecationLevel|)
+    public constructor(message: R|kotlin/String|, replaceWith: R|kotlin/ReplaceWith|, level: R|kotlin/DeprecationLevel|): R|kotlin/Deprecated|
 
 }
 
 public final enum class DeprecationLevel : R|kotlin/Enum<kotlin/DeprecationLevel>| {
-    private constructor()
+    private constructor(): R|kotlin/DeprecationLevel|
 
 }
 
@@ -408,10 +408,10 @@ public final class Double : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Double>
 
     public final operator fun unaryPlus(): R|kotlin/Double|
 
-    private constructor()
+    private constructor(): R|kotlin/Double|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Double.Companion|
 
     }
 
@@ -424,14 +424,14 @@ public final class DoubleArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Double|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Double>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Double>|): R|kotlin/DoubleArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/DoubleArray|
 
 }
 
 public final annotation class DslMarker : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/DslMarker|
 
 }
 
@@ -446,17 +446,17 @@ public final annotation class DslMarker : R|kotlin/Annotation| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(name: R|kotlin/String|, ordinal: R|kotlin/Int|)
+    public constructor(name: R|kotlin/String|, ordinal: R|kotlin/Int|): R|kotlin/Enum<E>|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Enum.Companion|
 
     }
 
 }
 
 public final annotation class ExtensionFunctionType : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/ExtensionFunctionType|
 
 }
 
@@ -567,10 +567,10 @@ public final class Float : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Float>|
 
     public final operator fun unaryPlus(): R|kotlin/Float|
 
-    private constructor()
+    private constructor(): R|kotlin/Float|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Float.Companion|
 
     }
 
@@ -583,9 +583,9 @@ public final class FloatArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Float|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Float>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Float>|): R|kotlin/FloatArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/FloatArray|
 
 }
 
@@ -721,10 +721,10 @@ public final class Int : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Int>| {
 
     public final infix fun xor(other: R|kotlin/Int|): R|kotlin/Int|
 
-    private constructor()
+    private constructor(): R|kotlin/Int|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Int.Companion|
 
     }
 
@@ -737,9 +737,9 @@ public final class IntArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Int|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Int>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Int>|): R|kotlin/IntArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/IntArray|
 
 }
 
@@ -872,10 +872,10 @@ public final class Long : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Long>| {
 
     public final infix fun xor(other: R|kotlin/Long|): R|kotlin/Long|
 
-    private constructor()
+    private constructor(): R|kotlin/Long|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Long.Companion|
 
     }
 
@@ -888,14 +888,14 @@ public final class LongArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Long|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Long>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Long>|): R|kotlin/LongArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/LongArray|
 
 }
 
 public final class Nothing {
-    private constructor()
+    private constructor(): R|kotlin/Nothing|
 
 }
 
@@ -914,22 +914,22 @@ public abstract class Number : R|kotlin/Any| {
 
     public abstract fun toShort(): R|kotlin/Short|
 
-    public constructor()
+    public constructor(): R|kotlin/Number|
 
 }
 
 public final annotation class ParameterName : R|kotlin/Annotation| {
-    public constructor(name: R|kotlin/String|)
+    public constructor(name: R|kotlin/String|): R|kotlin/ParameterName|
 
 }
 
 public final annotation class PublishedApi : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/PublishedApi|
 
 }
 
 public final annotation class ReplaceWith : R|kotlin/Annotation| {
-    public constructor(expression: R|kotlin/String|, vararg imports: R|kotlin/Array<out kotlin/String>|)
+    public constructor(expression: R|kotlin/String|, vararg imports: R|kotlin/Array<out kotlin/String>|): R|kotlin/ReplaceWith|
 
 }
 
@@ -1048,10 +1048,10 @@ public final class Short : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Short>|
 
     public final operator fun unaryPlus(): R|kotlin/Int|
 
-    private constructor()
+    private constructor(): R|kotlin/Short|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Short.Companion|
 
     }
 
@@ -1064,14 +1064,14 @@ public final class ShortArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Short|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Short>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Short>|): R|kotlin/ShortArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/ShortArray|
 
 }
 
 public final annotation class SinceKotlin : R|kotlin/Annotation| {
-    public constructor(version: R|kotlin/String|)
+    public constructor(version: R|kotlin/String|): R|kotlin/SinceKotlin|
 
 }
 
@@ -1084,40 +1084,39 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 
     public open fun subSequence(startIndex: R|kotlin/Int|, endIndex: R|kotlin/Int|): R|kotlin/CharSequence|
 
-    public constructor()
+    public constructor(): R|kotlin/String|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/String.Companion|
 
     }
 
 }
 
 public final annotation class Suppress : R|kotlin/Annotation| {
-    public constructor(vararg names: R|kotlin/Array<out kotlin/String>|)
+    public constructor(vararg names: R|kotlin/Array<out kotlin/String>|): R|kotlin/Suppress|
 
 }
 
 public open class Throwable : R|kotlin/Any| {
-    public constructor(message: R|kotlin/String|?)
+    public constructor(message: R|kotlin/String|?): R|kotlin/Throwable|
 
-    public constructor(cause: R|kotlin/Throwable|?)
+    public constructor(cause: R|kotlin/Throwable|?): R|kotlin/Throwable|
 
-    public constructor()
+    public constructor(): R|kotlin/Throwable|
 
-    public constructor(message: R|kotlin/String|?, cause: R|kotlin/Throwable|?)
+    public constructor(message: R|kotlin/String|?, cause: R|kotlin/Throwable|?): R|kotlin/Throwable|
 
 }
 
 public final object Unit : R|kotlin/Any| {
     public open fun toString(): R|kotlin/String|
 
-    private constructor()
+    private constructor(): R|kotlin/Unit|
 
 }
 
 public final annotation class UnsafeVariance : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/UnsafeVariance|
 
 }
-

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt

@@ -1,4 +1,4 @@
 public final annotation class AnnotatedAnnotation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/AnnotatedAnnotation|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt

@@ -1,6 +1,6 @@
 public open class AnnotatedMethod : R|kotlin/Any| {
     public open fun f(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/AnnotatedMethod|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt

@@ -1,24 +1,24 @@
 public final class AnnotationInAnnotationArguments : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/AnnotationInAnnotationArguments|
 
 }
 
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor()
+    private constructor(): R|test/E|
 
 }
 
 public final annotation class EnumOption : R|kotlin/Annotation| {
-    public constructor(option: R|test/E|)
+    public constructor(option: R|test/E|): R|test/EnumOption|
 
 }
 
 public final annotation class OptionGroups : R|kotlin/Annotation| {
-    public constructor(o1: R|test/StringOptions|, o2: R|test/EnumOption|)
+    public constructor(o1: R|test/StringOptions|, o2: R|test/EnumOption|): R|test/OptionGroups|
 
 }
 
 public final annotation class StringOptions : R|kotlin/Annotation| {
-    public constructor(vararg option: R|kotlin/Array<out kotlin/String>|)
+    public constructor(vararg option: R|kotlin/Array<out kotlin/String>|): R|test/StringOptions|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(klass: R|kotlin/reflect/KClass<*>|, klasses: R|kotlin/Array<kotlin/reflect/KClass<*>>|, sarKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|, d2arKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|)
+    public constructor(klass: R|kotlin/reflect/KClass<*>|, klasses: R|kotlin/Array<kotlin/reflect/KClass<*>>|, sarKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|, d2arKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|): R|test/Anno|
 
 }
 
 public final class Klass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Klass|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt

@@ -1,21 +1,21 @@
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor()
+    private constructor(): R|test/E|
 
 }
 
 public final annotation class EnumAnno : R|kotlin/Annotation| {
-    public constructor(value: R|test/E|)
+    public constructor(value: R|test/E|): R|test/EnumAnno|
 
 }
 
 public final class EnumArgumentWithCustomToString : R|kotlin/Any| {
     public final fun annotated(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/EnumArgumentWithCustomToString|
 
 }
 
 public final annotation class EnumArrayAnno : R|kotlin/Annotation| {
-    public constructor(vararg value: R|kotlin/Array<out test/E>|)
+    public constructor(vararg value: R|kotlin/Array<out test/E>|): R|test/EnumArrayAnno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt

@@ -1,5 +1,5 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(s: R|kotlin/String|)
+    public constructor(s: R|kotlin/String|): R|test/Anno|
 
 }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(bytes: R|kotlin/ByteArray|, shorts: R|kotlin/ShortArray|, ints: R|kotlin/IntArray|, longs: R|kotlin/LongArray|, chars: R|kotlin/CharArray|, floats: R|kotlin/FloatArray|, doubles: R|kotlin/DoubleArray|, booleans: R|kotlin/BooleanArray|)
+    public constructor(bytes: R|kotlin/ByteArray|, shorts: R|kotlin/ShortArray|, ints: R|kotlin/IntArray|, longs: R|kotlin/LongArray|, chars: R|kotlin/CharArray|, floats: R|kotlin/FloatArray|, doubles: R|kotlin/DoubleArray|, booleans: R|kotlin/BooleanArray|): R|test/Anno|
 
 }
 
 public final class Klass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Klass|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt

@@ -1,4 +1,4 @@
 public final annotation class SimpleAnnotation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/SimpleAnnotation|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt

@@ -1,4 +1,4 @@
 public final annotation class TargetedAnnotation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/TargetedAnnotation|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt

@@ -1,13 +1,13 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/String|)
+    public constructor(value: R|kotlin/String|): R|test/Anno|
 
 }
 
 public final class Constructor : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Constructor|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt

@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(t: R|java/lang/annotation/ElementType|)
+    public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt

@@ -1,14 +1,14 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/String|, x: R|kotlin/Int|)
+    public constructor(value: R|kotlin/String|, x: R|kotlin/Int|): R|test/Anno|
 
 }
 
 public final annotation class Bnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Bnno|
 
 }
 
 public final enum class Eee : R|kotlin/Enum<test/Eee>| {
-    private constructor()
+    private constructor(): R|test/Eee|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Function.txt

@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt

@@ -1,24 +1,24 @@
 public final annotation class Ann : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Ann|
 
 }
 
 public sealed class Sealed : R|kotlin/Any| {
-    private constructor(z: R|test/Z|)
+    private constructor(z: R|test/Z|): R|test/Sealed|
 
     public final class Derived : R|test/Sealed| {
-        public constructor(z: R|test/Z|)
+        public constructor(z: R|test/Z|): R|test/Sealed.Derived|
 
     }
 
 }
 
 public final class Test : R|kotlin/Any| {
-    public constructor(z: R|test/Z|, a: R|kotlin/Int|)
+    public constructor(z: R|test/Z|, a: R|kotlin/Int|): R|test/Test|
 
-    private constructor(z: R|test/Z|, s: R|kotlin/String|)
+    private constructor(z: R|test/Z|, s: R|kotlin/String|): R|test/Test|
 
-    public constructor(z: R|test/Z|)
+    public constructor(z: R|test/Z|): R|test/Test|
 
 }
 
@@ -29,6 +29,6 @@ public final inline class Z : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(x: R|kotlin/Int|)
+    public constructor(x: R|kotlin/Int|): R|test/Z|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt

@@ -5,6 +5,6 @@ public final inline class Z : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(value: R|kotlin/Int|)
+    internal constructor(value: R|kotlin/Int|): R|test/Z|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt

@@ -1,19 +1,19 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/A.Companion|
 
         public final annotation class Anno1 : R|kotlin/Annotation| {
-            public constructor()
+            public constructor(): R|test/A.Companion.Anno1|
 
         }
 
         public final class B : R|kotlin/Any| {
-            public constructor()
+            public constructor(): R|test/A.Companion.B|
 
             public final annotation class Anno2 : R|kotlin/Annotation| {
-                public constructor()
+                public constructor(): R|test/A.Companion.B.Anno2|
 
             }
 
@@ -24,6 +24,6 @@ public final class A : R|kotlin/Any| {
 }
 
 public final class C : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/C|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt

@@ -1,16 +1,16 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
         public final class Nested : R|kotlin/Any| {
-            public constructor()
+            public constructor(): R|test/Class.Companion.Nested|
 
         }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt

@@ -1,13 +1,13 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt

@@ -1,11 +1,11 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
     public final class B : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/A.B|
 
         public final companion object Companion : R|kotlin/Any| {
-            private constructor()
+            private constructor(): R|test/A.B.Companion|
 
         }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt

@@ -9,6 +9,6 @@ public final data class My : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(x: R|kotlin/Int|)
+    public constructor(x: R|kotlin/Int|): R|test/My|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt

@@ -1,18 +1,18 @@
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Nested|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt

@@ -1,19 +1,19 @@
 public final annotation class $$$$$$ : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/$$$$$$|
 
 }
 
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class Anno$tation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno$tation|
 
 }
 
 public final class Cla$s : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Cla$s|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt

@@ -1,23 +1,23 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(t: R|java/lang/annotation/ElementType|)
+    public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Nested|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt

@@ -1,19 +1,19 @@
 public final annotation class A1 : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A1|
 
 }
 
 public final annotation class A2 : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A2|
 
 }
 
 public final annotation class A3 : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A3|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt

@@ -1,8 +1,8 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
     public final annotation class Anno : R|kotlin/Annotation| {
-        public constructor()
+        public constructor(): R|test/A.Anno|
 
     }
 
@@ -11,6 +11,6 @@ public final class A : R|kotlin/Any| {
 public final class B : R|kotlin/Any| {
     public final fun f(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/B|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt

@@ -1,18 +1,18 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Nested|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Retention.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Simple.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class X : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/X|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt

@@ -1,44 +1,44 @@
 public final annotation class BooleanAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Boolean|)
+    public constructor(value: R|kotlin/Boolean|): R|test/BooleanAnno|
 
 }
 
 public final annotation class ByteAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Byte|)
+    public constructor(value: R|kotlin/Byte|): R|test/ByteAnno|
 
 }
 
 public final annotation class CharAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Char|)
+    public constructor(value: R|kotlin/Char|): R|test/CharAnno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
 
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Double|)
+    public constructor(value: R|kotlin/Double|): R|test/DoubleAnno|
 
 }
 
 public final annotation class FloatAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Float|)
+    public constructor(value: R|kotlin/Float|): R|test/FloatAnno|
 
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Int|)
+    public constructor(value: R|kotlin/Int|): R|test/IntAnno|
 
 }
 
 public final annotation class LongAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Long|)
+    public constructor(value: R|kotlin/Long|): R|test/LongAnno|
 
 }
 
 public final annotation class ShortAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Short|)
+    public constructor(value: R|kotlin/Short|): R|test/ShortAnno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(int: R|kotlin/Int|, string: R|kotlin/String|, double: R|kotlin/Double|)
+    public constructor(int: R|kotlin/Int|, string: R|kotlin/String|, double: R|kotlin/Double|): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt

@@ -1,6 +1,6 @@
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(t: R|java/lang/annotation/ElementType|)
+    public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt

@@ -3,6 +3,6 @@ public final fun baz(): R|kotlin/Unit|
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(vararg t: R|kotlin/Array<out java/lang/annotation/ElementType>|)
+    public constructor(vararg t: R|kotlin/Array<out java/lang/annotation/ElementType>|): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt

@@ -1,6 +1,6 @@
 public final fun function(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt

@@ -3,6 +3,6 @@ public final fun baz(): R|kotlin/Unit|
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(vararg t: R|kotlin/Array<out kotlin/String>|)
+    public constructor(vararg t: R|kotlin/Array<out kotlin/String>|): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt

@@ -1,14 +1,14 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor(x: R|kotlin/Int|, y: R|kotlin/String|)
+    public constructor(x: R|kotlin/Int|, y: R|kotlin/String|): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt

@@ -1,14 +1,14 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
 
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor(x: R|kotlin/String|, y: R|kotlin/Int|)
+    private constructor(x: R|kotlin/String|, y: R|kotlin/Int|): R|test/E|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt

@@ -1,6 +1,6 @@
 public final fun R|kotlin/Int|.foo(x: R|kotlin/Int|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt

@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun R|kotlin/String|.foo(x: R|kotlin/Int|): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt

@@ -1,9 +1,9 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt

@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(x: R|kotlin/String|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt

@@ -1,5 +1,5 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt

@@ -1,18 +1,18 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor(s: R|kotlin/String|)
+    public constructor(s: R|kotlin/String|): R|test/A|
 
 }
 
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor(y: R|kotlin/String|)
+        public constructor(y: R|kotlin/String|): R|test/Outer.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor(x: R|kotlin/String|)
+        public constructor(x: R|kotlin/String|): R|test/Outer.Nested|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt

@@ -3,21 +3,21 @@ public final fun bar(x: R|kotlin/Int|): R|kotlin/Unit|
 public final fun foo(x: R|kotlin/Int|, y: R|kotlin/Double|, z: R|kotlin/String|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
 
 public final annotation class C : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/C|
 
 }
 
 public final annotation class D : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/D|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt

@@ -1,9 +1,9 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt

@@ -1,6 +1,6 @@
 public final fun foo(x: R|kotlin/Int|): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt

@@ -1,9 +1,9 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt

@@ -1,13 +1,13 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt

@@ -1,19 +1,19 @@
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
 
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/DoubleAnno|
 
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/IntAnno|
 
 }
 
 public final annotation class StringAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/StringAnno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt

@@ -1,14 +1,14 @@
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/DoubleAnno|
 
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/IntAnno|
 
 }
 
 public final annotation class StringAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/StringAnno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt

@@ -1,10 +1,10 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public abstract interface Trait : R|kotlin/Any| {
     }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt

@@ -1,5 +1,5 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt

@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public abstract interface Trait : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Trait.Companion|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt

@@ -7,31 +7,31 @@ public final class A : R|kotlin/Any| {
 
     public final fun simple(s: R|kotlin/String|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class Ann : R|kotlin/Annotation| {
-    public constructor(klass: R|kotlin/reflect/KClass<*>|)
+    public constructor(klass: R|kotlin/reflect/KClass<*>|): R|test/Ann|
 
 }
 
 <T> public final class Generic : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Generic<T>|
 
 }
 
 <A, B> public final class InnerGeneric : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/InnerGeneric<A, B>|
 
     <C, D> public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/InnerGeneric.Inner<C, D>|
 
     }
 
 }
 
 public final class Simple : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Simple|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt

@@ -1,6 +1,6 @@
 public final fun R|kotlin/String|.foo(): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }