FIR: render constructor resolve phase in FirRenderer when renderDeclarationResolvePhase is requested

compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt

@@ -340,9 +340,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
     }
 
     override fun visitDeclaration(declaration: FirDeclaration) {
-        if (mode.renderDeclarationResolvePhase) {
+        declaration.renderPhaseIfNeeded()
-            print("[${declaration.resolvePhase}] ")
-        }
         print(
             when (declaration) {
                 is FirRegularClass -> declaration.classKind.name.toLowerCase().replace("_", " ")
@@ -359,6 +357,12 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
         )
     }
 
+    private fun FirDeclaration.renderPhaseIfNeeded() {
+        if (mode.renderDeclarationResolvePhase) {
+            print("[${resolvePhase}] ")
+        }
+    }
+
     private fun List<FirDeclaration>.renderDeclarations() {
         renderInBraces {
             for (declaration in this) {
@@ -458,6 +462,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
         if (constructor.isActual) {
             print("actual ")
         }
+        constructor.renderPhaseIfNeeded()
         print("constructor")
         constructor.typeParameters.renderTypeParameters()
         constructor.valueParameters.renderParameters()

idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/classMembers.txt

@@ -1,6 +1,6 @@
 FILE: classMembers.kt
     public final [BODY_RESOLVE] class A : R|kotlin/Any| {
-        public constructor(): R|A| {
+        public [CONTRACTS] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 

idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt

@@ -7,7 +7,7 @@ FILE: delegates.kt
     }
     public final [STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
     public final [IMPLICIT_TYPES_BODY_RESOLVE] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
-        private constructor(): R|<anonymous>| {
+        private [BODY_RESOLVE] constructor(): R|<anonymous>| {
             super<R|kotlin/Any|>()
         }
 

idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/secondaryConstructor.txt

@@ -4,6 +4,6 @@ FILE: secondaryConstructor.kt
     }
     public final [STATUS] fun receive(value: R|A|): R|kotlin/Unit| { LAZY_BLOCK }
     public final [STATUS] class A : R|kotlin/Any| {
-        public constructor(x: R|kotlin/Int|): R|A| { LAZY_BLOCK }
+        public [STATUS] constructor(x: R|kotlin/Int|): R|A| { LAZY_BLOCK }
 
     }

idea/testData/fir/lazyResolve/elvis/main.txt

@@ -1,6 +1,6 @@
 FILE: main.kt
     public final [BODY_RESOLVE] class WithElvis : R|kotlin/Any| {
-        public constructor(value: R|kotlin/String?|): R|elvis/WithElvis| {
+        public [CONTRACTS] constructor(value: R|kotlin/String?|): R|elvis/WithElvis| {
             super<R|kotlin/Any|>()
         }
 

idea/testData/fir/lazyResolve/inInit/main.txt

@@ -1,6 +1,6 @@
 FILE: main.kt
     public final [BODY_RESOLVE] class Foo : R|kotlin/Any| {
-        public constructor(): R|Foo| {
+        public [BODY_RESOLVE] constructor(): R|Foo| {
             super<R|kotlin/Any|>()
         }
 

idea/testData/fir/lazyResolve/inSecondary/main.txt

@@ -3,7 +3,7 @@ FILE: main.kt
         public final [CONTRACTS] val x: R|kotlin/Int|
             public get(): R|kotlin/Int|
 
-        public constructor(): R|Foo| {
+        public [BODY_RESOLVE] constructor(): R|Foo| {
             super<R|kotlin/Any|>()
             this@R|/Foo|.R|/Foo.x| = Int(42)
         }

idea/testData/fir/lazyResolve/secondary/main.txt

@@ -1,6 +1,6 @@
 FILE: main.kt
     public final [STATUS] class My : R|kotlin/Any| {
-        public constructor(): R|My| {
+        public [STATUS] constructor(): R|My| {
             super<R|kotlin/Any|>()
         }