FIR: extract BodyResolveContext.withField

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt

@@ -388,6 +388,20 @@ class BodyResolveContext(
         }
     }
 
+    inline fun <T> withField(
+        field: FirField,
+        crossinline f: () -> T
+    ): T {
+        return withTowerDataMode(FirTowerDataMode.CONSTRUCTOR_HEADER) {
+            withContainer(field) {
+                withTowerDataCleanup {
+                    getPrimaryConstructorAllParametersScope()?.let { addLocalScope(it) }
+                    f()
+                }
+            }
+        }
+    }
+
     inline fun <T> withProperty(
         property: FirProperty,
         crossinline f: () -> T

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt

@@ -179,15 +179,11 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
         }
         dataFlowAnalyzer.enterField(field)
         return withFullBodyResolve {
-            context.withTowerDataMode(FirTowerDataMode.CONSTRUCTOR_HEADER) {
+            context.withField(field) {
-                context.withContainer(field) {
+                field.transformChildren(transformer, withExpectedType(returnTypeRef))
-                    withPrimaryConstructorParameters(includeProperties = true) {
+            }
-                        field.transformChildren(transformer, withExpectedType(returnTypeRef))
+            if (field.initializer != null) {
-                    }
+                storeVariableReturnType(field)
-                    if (field.initializer != null) {
-                        storeVariableReturnType(field)
-                    }
-                }
             }
             transformer.replaceDeclarationResolvePhaseIfNeeded(field, transformerPhase)
             dataFlowAnalyzer.exitField(field)