[FIR] Move ARGUMENTS_OF_ANNOTATIONS on top of STATUS phase

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/ResolvePhaseUtils.kt

@@ -28,9 +28,9 @@ fun FirResolvePhase.createCompilerProcessorByPhase(
         SUPER_TYPES -> FirSupertypeResolverProcessor(session, scopeSession)
         SEALED_CLASS_INHERITORS -> FirSealedClassInheritorsProcessor(session, scopeSession)
         TYPES -> FirTypeResolveProcessor(session, scopeSession)
-        ARGUMENTS_OF_ANNOTATIONS -> FirAnnotationArgumentsResolveProcessor(session, scopeSession)
         EXTENSION_STATUS_UPDATE -> FirGlobalExtensionStatusProcessor(session, scopeSession)
         STATUS -> FirStatusResolveProcessor(session, scopeSession)
+        ARGUMENTS_OF_ANNOTATIONS -> FirAnnotationArgumentsResolveProcessor(session, scopeSession)
         CONTRACTS -> FirContractResolveProcessor(session, scopeSession)
         NEW_MEMBERS_GENERATION -> FirGlobalNewMemberGenerationProcessor(session, scopeSession)
         IMPLICIT_TYPES_BODY_RESOLVE -> FirImplicitTypeBodyResolveProcessor(session, scopeSession)

compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt

@@ -13,9 +13,9 @@ enum class FirResolvePhase(val pluginPhase: Boolean = false, val noProcessor: Bo
     SUPER_TYPES,
     SEALED_CLASS_INHERITORS,
     TYPES,
-    ARGUMENTS_OF_ANNOTATIONS,
     EXTENSION_STATUS_UPDATE(pluginPhase = true),
     STATUS,
+    ARGUMENTS_OF_ANNOTATIONS,
     CONTRACTS,
     NEW_MEMBERS_GENERATION(pluginPhase = true),
     IMPLICIT_TYPES_BODY_RESOLVE,

idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/transformers/FirDesignatedAnnotationArgumentsResolveTransformerForIDE.kt

@@ -50,7 +50,7 @@ internal class FirDesignatedAnnotationArgumentsResolveTransformerForIDE(
 
     override fun transformDeclaration(phaseRunner: FirPhaseRunner) {
         if (designation.declaration.resolvePhase >= FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) return
-        designation.declaration.ensurePhase(FirResolvePhase.TYPES)
+        designation.declaration.ensurePhase(FirResolvePhase.STATUS)
 
         val designationIterator = designation.toSequenceWithFile(includeTarget = false).iterator()
 
@@ -65,7 +65,7 @@ internal class FirDesignatedAnnotationArgumentsResolveTransformerForIDE(
 
     override fun ensureResolved(declaration: FirDeclaration) {
         if (declaration is FirAnnotatedDeclaration) {
-            val unresolvedAnnotation = declaration.annotations.firstOrNull { it.resolveStatus == FirAnnotationResolveStatus.Resolved }
+            val unresolvedAnnotation = declaration.annotations.firstOrNull { it.resolveStatus == FirAnnotationResolveStatus.Unresolved }
             check(unresolvedAnnotation == null) {
                 "Unexpected resolve status of annotation, expected Resolved but actual $unresolvedAnnotation"
             }

idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/transformers/FirDesignatedContractsResolveTransformerForIDE.kt

@@ -44,7 +44,7 @@ internal class FirDesignatedContractsResolveTransformerForIDE(
 
     override fun transformDeclaration(phaseRunner: FirPhaseRunner) {
         if (designation.declaration.resolvePhase >= FirResolvePhase.CONTRACTS) return
-        designation.declaration.ensurePhase(FirResolvePhase.STATUS)
+        designation.declaration.ensurePhase(FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS)
 
         FirLazyBodiesCalculator.calculateLazyBodiesInside(designation)
         phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.CONTRACTS) {

idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/transformers/FirDesignatedStatusResolveTransformerForIDE.kt

@@ -37,7 +37,7 @@ internal class FirDesignatedStatusResolveTransformerForIDE(
 
     override fun transformDeclaration(phaseRunner: FirPhaseRunner) {
         if (designation.declaration.resolvePhase >= FirResolvePhase.STATUS) return
-        designation.declaration.ensurePhase(FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS)
+        designation.declaration.ensurePhase(FirResolvePhase.TYPES)
 
         val transformer = FirDesignatedStatusResolveTransformerForIDE()
         phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.STATUS) {

idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/transformers/LazyTransformerFactory.kt

@@ -39,12 +39,12 @@ internal object LazyTransformerFactory {
             designation.firFile.moduleData.session,
             scopeSession,
         )
-        FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS -> FirDesignatedAnnotationArgumentsResolveTransformerForIDE(
+        FirResolvePhase.STATUS -> FirDesignatedStatusResolveTransformerForIDE(
             designation,
             designation.firFile.moduleData.session,
             scopeSession,
         )
-        FirResolvePhase.STATUS -> FirDesignatedStatusResolveTransformerForIDE(
+        FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS -> FirDesignatedAnnotationArgumentsResolveTransformerForIDE(
             designation,
             designation.firFile.moduleData.session,
             scopeSession,

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

@@ -146,14 +146,14 @@ FILE: annotationParameters.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: annotationParameters.kt
-    public final [STATUS] enum class X : R|kotlin/Enum<X>| {
+    public? final? [RAW_FIR] enum class X : R|kotlin/Enum<X>| {
-        private [STATUS] [ContainingClassKey=X] constructor(): R|X| {
+        private [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Enum<X>|>()
         }
 
-        public final static [STATUS] [ContainingClassKey=X] enum entry A: R|X|
+        public final static [RAW_FIR] [ContainingClassKey=X] enum entry A: R|X|
         public final static [BODY_RESOLVE] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
         }
 
@@ -170,12 +170,12 @@ FILE: annotationParameters.kt
             [TYPES] public? get(): A.X
 
     }
-    public? final? [SUPER_TYPES] class B : R|kotlin/Any| {
+    public final [SUPER_TYPES] class B : R|kotlin/Any| {
         public? [SUPER_TYPES] [ContainingClassKey=B] constructor(): R|B| {
             super<R|kotlin/Any|>()
         }
 
-        @R|Anno|(Q|X|.R|/X.A|) public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|(X#.A#) public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
         }
 
         @Anno(X#.A#) public? final? [SUPER_TYPES] fun foo(): R|kotlin/Unit| {
@@ -183,7 +183,7 @@ FILE: annotationParameters.kt
 
     }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: annotationParameters.kt
     public final [STATUS] enum class X : R|kotlin/Enum<X>| {
         private [STATUS] [ContainingClassKey=X] constructor(): R|X| {
@@ -212,7 +212,7 @@ FILE: annotationParameters.kt
             super<R|kotlin/Any|>()
         }
 
-        @R|Anno|(Q|X|.R|/X.A|) public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|(Q|X|.R|/X.A|) public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         }
 
         @Anno(X#.A#) public? final? [SUPER_TYPES] fun foo(): R|kotlin/Unit| {
@@ -289,7 +289,7 @@ FILE: annotationParameters.kt
         @R|Anno|(Q|X|.R|/X.A|) public final [IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         }
 
-        @R|Anno|(Q|X|.R|/X.A|) public final [STATUS] fun foo(): R|kotlin/Unit| {
+        @R|Anno|(X#.A#) public final [STATUS] fun foo(): R|kotlin/Unit| {
         }
 
     }
@@ -326,7 +326,7 @@ FILE: annotationParameters.kt
         @R|Anno|(Q|X|.R|/X.A|) public final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         }
 
-        @R|Anno|(Q|X|.R|/X.A|) public final [STATUS] fun foo(): R|kotlin/Unit| {
+        @R|Anno|(X#.A#) public final [STATUS] fun foo(): R|kotlin/Unit| {
         }
 
     }
@@ -400,7 +400,7 @@ FILE: annotationParameters.kt
         @R|Anno|(Q|X|.R|/X.A|) public final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         }
 
-        @R|Anno|(Q|X|.R|/X.A|) public final [STATUS] fun foo(): R|kotlin/Unit| {
+        @R|Anno|(X#.A#) public final [STATUS] fun foo(): R|kotlin/Unit| {
         }
 
     }
@@ -437,7 +437,7 @@ FILE: annotationParameters.kt
         @R|Anno|(Q|X|.R|/X.A|) public final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         }
 
-        @R|Anno|(Q|X|.R|/X.A|) public final [STATUS] fun foo(): R|kotlin/Unit| {
+        @R|Anno|(X#.A#) public final [STATUS] fun foo(): R|kotlin/Unit| {
         }
 
     }
@@ -540,12 +540,12 @@ FILE: annotationParameters.kt
             [TYPES] public? get(): A.X
 
     }
-    public? final? [SUPER_TYPES] class B : R|kotlin/Any| {
+    public final [SUPER_TYPES] class B : R|kotlin/Any| {
         public? [SUPER_TYPES] [ContainingClassKey=B] constructor(): R|B| {
             super<R|kotlin/Any|>()
         }
 
-        @R|Anno|(Q|X|.R|/X.A|) public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|(Q|X|.R|/X.A|) public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         }
 
         @Anno(X#.A#) public? final? [SUPER_TYPES] fun foo(): R|kotlin/Unit| {
@@ -592,12 +592,12 @@ FILE: annotationParameters.kt
 
 DeclarationStatus:
 FILE: annotationParameters.kt
-    public final [STATUS] enum class X : R|kotlin/Enum<X>| {
+    public? final? [RAW_FIR] enum class X : R|kotlin/Enum<X>| {
-        private [STATUS] [ContainingClassKey=X] constructor(): R|X| {
+        private [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Enum<X>|>()
         }
 
-        public final static [STATUS] [ContainingClassKey=X] enum entry A: R|X|
+        public final static [RAW_FIR] [ContainingClassKey=X] enum entry A: R|X|
         public final static [BODY_RESOLVE] [ContainingClassKey=X] fun values(): R|kotlin/Array<X>| {
         }
 
@@ -619,7 +619,7 @@ FILE: annotationParameters.kt
             super<R|kotlin/Any|>()
         }
 
-        @R|Anno|(Q|X|.R|/X.A|) public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|(X#.A#) public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
         }
 
         @Anno(X#.A#) public? final? [SUPER_TYPES] fun foo(): R|kotlin/Unit| {

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

@@ -22,18 +22,18 @@ FILE: annotations.kt
     @R|kotlin/Suppress|(String(2)) public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| {
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: annotations.kt
-    @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(String(2)) public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
-    }
-
 STATUS:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
     @R|kotlin/Suppress|(String(2)) public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
     }
 
+ARGUMENTS_OF_ANNOTATIONS:
+FILE: annotations.kt
+    @FILE:Suppress(String(1))
+    @R|kotlin/Suppress|(String(2)) public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    }
+
 CONTRACTS:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
@@ -85,7 +85,7 @@ FILE: annotations.kt
 AnnotationsArguments:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(String(2)) public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(String(2)) public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
     }
 
 CallableContracts:

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

@@ -98,14 +98,14 @@ FILE: classMembers.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: classMembers.kt
-    public? final? [SUPER_TYPES] class A : R|kotlin/Any| {
+    public final [SUPER_TYPES] class A : R|kotlin/Any| {
         public? [SUPER_TYPES] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+        public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
@@ -123,14 +123,14 @@ FILE: classMembers.kt
 
     }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: classMembers.kt
     public final [SUPER_TYPES] class A : R|kotlin/Any| {
         public? [SUPER_TYPES] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
+        public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
@@ -350,12 +350,12 @@ FILE: classMembers.kt
 
 AnnotationsArguments:
 FILE: classMembers.kt
-    public? final? [SUPER_TYPES] class A : R|kotlin/Any| {
+    public final [SUPER_TYPES] class A : R|kotlin/Any| {
         public? [SUPER_TYPES] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+        public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 

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

@@ -190,9 +190,9 @@ FILE: delegates.kt
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: delegates.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
@@ -238,9 +238,9 @@ FILE: delegates.kt
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: delegates.kt
-    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
@@ -672,7 +672,7 @@ FILE: delegates.kt
 
 AnnotationsArguments:
 FILE: delegates.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)

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

@@ -30,14 +30,6 @@ FILE: functionWithParameter.kt
         ^resolveMe Unit#
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: functionWithParameter.kt
-    public? final? [RAW_FIR] interface I : R|kotlin/Any| {
-    }
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe([RAW_FIR] param: R|I|): <implicit> {
-        ^resolveMe Unit#
-    }
-
 STATUS:
 FILE: functionWithParameter.kt
     public? final? [RAW_FIR] interface I : R|kotlin/Any| {
@@ -46,6 +38,14 @@ FILE: functionWithParameter.kt
         ^resolveMe Unit#
     }
 
+ARGUMENTS_OF_ANNOTATIONS:
+FILE: functionWithParameter.kt
+    public? final? [RAW_FIR] interface I : R|kotlin/Any| {
+    }
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe([RAW_FIR] param: R|I|): <implicit> {
+        ^resolveMe Unit#
+    }
+
 CONTRACTS:
 FILE: functionWithParameter.kt
     public? final? [RAW_FIR] interface I : R|kotlin/Any| {
@@ -114,7 +114,7 @@ AnnotationsArguments:
 FILE: functionWithParameter.kt
     public? final? [RAW_FIR] interface I : R|kotlin/Any| {
     }
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe([RAW_FIR] param: R|I|): <implicit> {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe([RAW_FIR] param: R|I|): <implicit> {
         ^resolveMe Unit#
     }
 

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

@@ -86,7 +86,7 @@ FILE: localDeclaration.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: localDeclaration.kt
     public final [STATUS] class A : R|kotlin/Any| {
         public [STATUS] [ContainingClassKey=A] constructor(): R|A| {
@@ -108,7 +108,7 @@ FILE: localDeclaration.kt
 
     }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: localDeclaration.kt
     public final [STATUS] class A : R|kotlin/Any| {
         public [STATUS] [ContainingClassKey=A] constructor(): R|A| {

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

@@ -58,7 +58,7 @@ FILE: localFunction.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: localFunction.kt
     public final [STATUS] class A : R|kotlin/Any| {
         public [STATUS] [ContainingClassKey=A] constructor(): R|A| {
@@ -73,7 +73,7 @@ FILE: localFunction.kt
 
     }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: localFunction.kt
     public final [STATUS] class A : R|kotlin/Any| {
         public [STATUS] [ContainingClassKey=A] constructor(): R|A| {

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

@@ -70,7 +70,7 @@ FILE: parameterOfLocalSetter.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: parameterOfLocalSetter.kt
     public final [BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
         local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
@@ -88,7 +88,7 @@ FILE: parameterOfLocalSetter.kt
 
     }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: parameterOfLocalSetter.kt
     public final [BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
         local final [BODY_RESOLVE] class XX : R|kotlin/Any| {

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

@@ -58,21 +58,6 @@ FILE: parameterOfNonLocalSetter.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: parameterOfNonLocalSetter.kt
-    public? final? [SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [SUPER_TYPES] [ContainingClassKey=X] constructor(): R|X| {
-            super<R|kotlin/Any|>()
-        }
-
-        public? final? [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [TYPES] [ContainingClassKey=X] public? get(): R|kotlin/Int|
-            [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-                ^ Unit#
-            }
-
-    }
-
 STATUS:
 FILE: parameterOfNonLocalSetter.kt
     public final [SUPER_TYPES] class X : R|kotlin/Any| {
@@ -88,6 +73,21 @@ FILE: parameterOfNonLocalSetter.kt
 
     }
 
+ARGUMENTS_OF_ANNOTATIONS:
+FILE: parameterOfNonLocalSetter.kt
+    public final [SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [SUPER_TYPES] [ContainingClassKey=X] constructor(): R|X| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = IntegerLiteral(2)
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+                ^ Unit#
+            }
+
+    }
+
 CONTRACTS:
 FILE: parameterOfNonLocalSetter.kt
     public final [SUPER_TYPES] class X : R|kotlin/Any| {
@@ -210,14 +210,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 AnnotationsArguments:
 FILE: parameterOfNonLocalSetter.kt
-    public? final? [SUPER_TYPES] class X : R|kotlin/Any| {
+    public final [SUPER_TYPES] class X : R|kotlin/Any| {
         public? [SUPER_TYPES] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = IntegerLiteral(2)
+        public final [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [TYPES] [ContainingClassKey=X] public? get(): R|kotlin/Int|
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
-            [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Unit#
             }
 

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

@@ -46,9 +46,9 @@ FILE: propertyWithGetter.kt
             ^ IntegerLiteral(42)
         }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: propertyWithGetter.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
@@ -58,9 +58,9 @@ FILE: propertyWithGetter.kt
             ^ IntegerLiteral(42)
         }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: propertyWithGetter.kt
-    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
@@ -168,7 +168,7 @@ FILE: propertyWithGetter.kt
 
 AnnotationsArguments:
 FILE: propertyWithGetter.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {

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

@@ -62,9 +62,9 @@ FILE: propertyWithGetterAndSetter.kt
             field# = value#
         }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: propertyWithGetterAndSetter.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
@@ -78,9 +78,9 @@ FILE: propertyWithGetterAndSetter.kt
             field# = value#
         }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: propertyWithGetterAndSetter.kt
-    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
@@ -224,7 +224,7 @@ FILE: propertyWithGetterAndSetter.kt
 
 AnnotationsArguments:
 FILE: propertyWithGetterAndSetter.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }

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

@@ -30,17 +30,17 @@ FILE: propertyWithInitializer.kt
     public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
         [TYPES] public? get(): Int
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: propertyWithInitializer.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
     public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
         [TYPES] public? get(): Int
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: propertyWithInitializer.kt
-    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
     public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
@@ -112,7 +112,7 @@ FILE: propertyWithInitializer.kt
 
 AnnotationsArguments:
 FILE: propertyWithInitializer.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
     public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)

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

@@ -58,9 +58,9 @@ FILE: secondaryConstructor.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: secondaryConstructor.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
@@ -73,9 +73,9 @@ FILE: secondaryConstructor.kt
 
     }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: secondaryConstructor.kt
-    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
@@ -210,7 +210,7 @@ FILE: secondaryConstructor.kt
 
 AnnotationsArguments:
 FILE: secondaryConstructor.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {

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

@@ -82,27 +82,6 @@ FILE: superTypes.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: superTypes.kt
-    public? open [SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [SUPER_TYPES] [ContainingClassKey=A] constructor(): R|A| {
-            super<R|kotlin/Any|>()
-        }
-
-    }
-    public? open [RAW_FIR] class B : A {
-        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
-            super<A>()
-        }
-
-    }
-    public? open [ARGUMENTS_OF_ANNOTATIONS] class resolveMe : R|A| {
-        public? [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
-            super<R|A|>()
-        }
-
-    }
-
 STATUS:
 FILE: superTypes.kt
     public open [TYPES] class A : R|kotlin/Any| {
@@ -124,6 +103,27 @@ FILE: superTypes.kt
 
     }
 
+ARGUMENTS_OF_ANNOTATIONS:
+FILE: superTypes.kt
+    public open [TYPES] class A : R|kotlin/Any| {
+        public [TYPES] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
+            super<A>()
+        }
+
+    }
+    public open [ARGUMENTS_OF_ANNOTATIONS] class resolveMe : R|A| {
+        public [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+            super<R|A|>()
+        }
+
+    }
+
 CONTRACTS:
 FILE: superTypes.kt
     public open [TYPES] class A : R|kotlin/Any| {
@@ -252,8 +252,8 @@ FILE: superTypes.kt
 
 AnnotationsArguments:
 FILE: superTypes.kt
-    public? open [SUPER_TYPES] class A : R|kotlin/Any| {
+    public open [TYPES] class A : R|kotlin/Any| {
-        public? [SUPER_TYPES] [ContainingClassKey=A] constructor(): R|A| {
+        public [TYPES] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
@@ -264,8 +264,8 @@ FILE: superTypes.kt
         }
 
     }
-    public? open [ARGUMENTS_OF_ANNOTATIONS] class resolveMe : R|A| {
+    public open [ARGUMENTS_OF_ANNOTATIONS] class resolveMe : R|A| {
-        public? [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+        public [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 

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

@@ -106,10 +106,10 @@ FILE: superTypesLoop.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: superTypesLoop.kt
-    public? open [ARGUMENTS_OF_ANNOTATIONS] class resolveMe : R|C| {
+    public open [STATUS] class resolveMe : R|C| {
-        public? [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+        public [STATUS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
@@ -126,17 +126,17 @@ FILE: superTypesLoop.kt
         }
 
     }
-    public? open [SUPER_TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+    public open [TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public? [SUPER_TYPES] [ContainingClassKey=C] constructor(): R|C| {
+        public [TYPES] [ContainingClassKey=C] constructor(): R|C| {
-            super<A>()
+            super<R|A|>()
         }
 
     }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: superTypesLoop.kt
-    public open [STATUS] class resolveMe : R|C| {
+    public open [ARGUMENTS_OF_ANNOTATIONS] class resolveMe : R|C| {
-        public [STATUS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+        public [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
@@ -324,8 +324,8 @@ FILE: superTypesLoop.kt
 
 AnnotationsArguments:
 FILE: superTypesLoop.kt
-    public? open [ARGUMENTS_OF_ANNOTATIONS] class resolveMe : R|C| {
+    public open [ARGUMENTS_OF_ANNOTATIONS] class resolveMe : R|C| {
-        public? [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+        public [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
@@ -342,9 +342,9 @@ FILE: superTypesLoop.kt
         }
 
     }
-    public? open [SUPER_TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+    public open [TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public? [SUPER_TYPES] [ContainingClassKey=C] constructor(): R|C| {
+        public [TYPES] [ContainingClassKey=C] constructor(): R|C| {
-            super<A>()
+            super<R|A|>()
         }
 
     }

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

@@ -42,9 +42,9 @@ FILE: topLevelFunctions.kt
         ^functionWithLazyBody String(42)
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: topLevelFunctions.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
@@ -53,9 +53,9 @@ FILE: topLevelFunctions.kt
         ^functionWithLazyBody String(42)
     }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: topLevelFunctions.kt
-    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
@@ -154,7 +154,7 @@ FILE: topLevelFunctions.kt
 
 AnnotationsArguments:
 FILE: topLevelFunctions.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {

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

@@ -42,9 +42,9 @@ FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
         ^functionWithLazyBody String(42)
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
@@ -53,9 +53,9 @@ FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
         ^functionWithLazyBody String(42)
     }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
@@ -154,7 +154,7 @@ FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
 
 AnnotationsArguments:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {

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

@@ -42,9 +42,9 @@ FILE: topLevelFunctionsWithImplicitType.kt
         ^functionWithLazyBody String(42)
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
@@ -53,9 +53,9 @@ FILE: topLevelFunctionsWithImplicitType.kt
         ^functionWithLazyBody String(42)
     }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public final [STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
@@ -154,7 +154,7 @@ FILE: topLevelFunctionsWithImplicitType.kt
 
 AnnotationsArguments:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
     public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {

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

@@ -30,7 +30,7 @@ FILE: typeParameterOfLocalFunction.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
+STATUS:
 FILE: typeParameterOfLocalFunction.kt
     public final [BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
         local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
@@ -38,7 +38,7 @@ FILE: typeParameterOfLocalFunction.kt
 
     }
 
-STATUS:
+ARGUMENTS_OF_ANNOTATIONS:
 FILE: typeParameterOfLocalFunction.kt
     public final [BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
         local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {

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

@@ -46,18 +46,6 @@ FILE: typeParameterOfNonLocalFunction.kt
 
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: typeParameterOfNonLocalFunction.kt
-    public? final? [SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [SUPER_TYPES] [ContainingClassKey=X] constructor(): R|X| {
-            super<R|kotlin/Any|>()
-        }
-
-        public? final? [ARGUMENTS_OF_ANNOTATIONS] fun <resolveMe> ddd(): R|kotlin/Unit| {
-        }
-
-    }
-
 STATUS:
 FILE: typeParameterOfNonLocalFunction.kt
     public final [SUPER_TYPES] class X : R|kotlin/Any| {
@@ -70,6 +58,18 @@ FILE: typeParameterOfNonLocalFunction.kt
 
     }
 
+ARGUMENTS_OF_ANNOTATIONS:
+FILE: typeParameterOfNonLocalFunction.kt
+    public final [SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [SUPER_TYPES] [ContainingClassKey=X] constructor(): R|X| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [ARGUMENTS_OF_ANNOTATIONS] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        }
+
+    }
+
 CONTRACTS:
 FILE: typeParameterOfNonLocalFunction.kt
     public final [SUPER_TYPES] class X : R|kotlin/Any| {
@@ -144,12 +144,12 @@ FILE: typeParameterOfNonLocalFunction.kt
 
 AnnotationsArguments:
 FILE: typeParameterOfNonLocalFunction.kt
-    public? final? [SUPER_TYPES] class X : R|kotlin/Any| {
+    public final [SUPER_TYPES] class X : R|kotlin/Any| {
         public? [SUPER_TYPES] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ARGUMENTS_OF_ANNOTATIONS] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public final [ARGUMENTS_OF_ANNOTATIONS] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }

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

@@ -18,16 +18,16 @@ FILE: typeParameterOfTopFunction.kt
     public? final? [TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: typeParameterOfTopFunction.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun <resolveMe> ddd(): R|kotlin/Unit| {
-    }
-
 STATUS:
 FILE: typeParameterOfTopFunction.kt
     public final [STATUS] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
+ARGUMENTS_OF_ANNOTATIONS:
+FILE: typeParameterOfTopFunction.kt
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    }
+
 CONTRACTS:
 FILE: typeParameterOfTopFunction.kt
     public final [CONTRACTS] fun <resolveMe> ddd(): R|kotlin/Unit| {
@@ -60,7 +60,7 @@ FILE: typeParameterOfTopFunction.kt
 
 AnnotationsArguments:
 FILE: typeParameterOfTopFunction.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public final [ARGUMENTS_OF_ANNOTATIONS] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 DeclarationStatus:

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

@@ -30,14 +30,6 @@ FILE: typeParameterOfTopSetter.kt
             ^ Unit#
         }
 
-ARGUMENTS_OF_ANNOTATIONS:
-FILE: typeParameterOfTopSetter.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = IntegerLiteral(2)
-        [TYPES] public? get(): R|kotlin/Int|
-        [ARGUMENTS_OF_ANNOTATIONS] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
-            ^ Unit#
-        }
-
 STATUS:
 FILE: typeParameterOfTopSetter.kt
     public final [STATUS] var x: R|kotlin/Int| = IntegerLiteral(2)
@@ -46,6 +38,14 @@ FILE: typeParameterOfTopSetter.kt
             ^ Unit#
         }
 
+ARGUMENTS_OF_ANNOTATIONS:
+FILE: typeParameterOfTopSetter.kt
+    public final [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = IntegerLiteral(2)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        [ARGUMENTS_OF_ANNOTATIONS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            ^ Unit#
+        }
+
 CONTRACTS:
 FILE: typeParameterOfTopSetter.kt
     public final [CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2)
@@ -112,9 +112,9 @@ FILE: typeParameterOfTopSetter.kt
 
 AnnotationsArguments:
 FILE: typeParameterOfTopSetter.kt
-    public? final? [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = IntegerLiteral(2)
+    public final [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = IntegerLiteral(2)
-        [TYPES] public? get(): R|kotlin/Int|
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
-        [ARGUMENTS_OF_ANNOTATIONS] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        [ARGUMENTS_OF_ANNOTATIONS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Unit#
         }