diff --git a/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationClassLevel.lazy.resolve.txt b/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationClassLevel.lazy.resolve.txt index 20267f82a2d..e33b57500c4 100644 --- a/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationClassLevel.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationClassLevel.lazy.resolve.txt @@ -4,14 +4,14 @@ FILE: [ResolvedTo(BODY_RESOLVE)] danglingAnnotationClassLevel.kt super() } - @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() + [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } public final [ResolvedTo(BODY_RESOLVE)] class Bar : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Bar| { super() } - @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() + [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } public final [ResolvedTo(BODY_RESOLVE)] class Outer : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Outer| { @@ -23,7 +23,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] danglingAnnotationClassLevel.kt super() } - @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() + [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { @@ -32,7 +32,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] danglingAnnotationClassLevel.kt super() } - @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() + [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } } diff --git a/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt b/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt index 2c676aa0828..6ac3b0dd779 100644 --- a/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt @@ -8,7 +8,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] danglingAnnotationClassLevelScript.kts super() } - @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() + [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } public final [ResolvedTo(BODY_RESOLVE)] class Bar : R|kotlin/Any| { @@ -16,7 +16,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] danglingAnnotationClassLevelScript.kts super() } - @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() + [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } public final [ResolvedTo(BODY_RESOLVE)] class Outer : R|kotlin/Any| { @@ -29,7 +29,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] danglingAnnotationClassLevelScript.kts super() } - @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() + [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { @@ -38,9 +38,10 @@ FILE: [ResolvedTo(BODY_RESOLVE)] danglingAnnotationClassLevelScript.kts super() } - @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() + [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } } } + diff --git a/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationTopLevel.lazy.resolve.txt b/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationTopLevel.lazy.resolve.txt index 336ccb4e3f9..5077abe5066 100644 --- a/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationTopLevel.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testData/fileStructure/danglingAnnotationTopLevel.lazy.resolve.txt @@ -1,2 +1,2 @@ FILE: [ResolvedTo(BODY_RESOLVE)] danglingAnnotationTopLevel.kt - @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() + [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/fileStructure/initBlock.lazy.resolve.txt b/analysis/low-level-api-fir/testData/fileStructure/initBlock.lazy.resolve.txt index c894024e1d6..d50110e915e 100644 --- a/analysis/low-level-api-fir/testData/fileStructure/initBlock.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testData/fileStructure/initBlock.lazy.resolve.txt @@ -4,7 +4,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] initBlock.kt super() } - init { + [ResolvedTo(BODY_RESOLVE)] init { [ResolvedTo(RAW_FIR)] lval x: R|kotlin/Int| = Int(10) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { public [ResolvedTo(RAW_FIR)] constructor(): R|/B| { diff --git a/analysis/low-level-api-fir/testData/fileStructure/initBlockScript.lazy.resolve.txt b/analysis/low-level-api-fir/testData/fileStructure/initBlockScript.lazy.resolve.txt index 1e3b2d5b789..2212a3a4ee2 100644 --- a/analysis/low-level-api-fir/testData/fileStructure/initBlockScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testData/fileStructure/initBlockScript.lazy.resolve.txt @@ -8,7 +8,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] initBlockScript.kts super() } - init { + [ResolvedTo(BODY_RESOLVE)] init { [ResolvedTo(RAW_FIR)] lval x: R|kotlin/Int| = Int(10) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { public [ResolvedTo(RAW_FIR)] constructor(): R|/B| { @@ -20,3 +20,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] initBlockScript.kts } } + diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/danglingAnnotation.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/danglingAnnotation.txt index 999aa4d406b..4f750dcd26e 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/danglingAnnotation.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/danglingAnnotation.txt @@ -7,4 +7,4 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] danglingAnnotation.kt - @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() + [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/danglingAnnotationInClass.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/danglingAnnotationInClass.txt index b3e5c504e3c..68fc747c1e7 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/danglingAnnotationInClass.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/danglingAnnotationInClass.txt @@ -12,5 +12,5 @@ FILE: [ResolvedTo(IMPORTS)] danglingAnnotationInClass.kt super() } - @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() - } + [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/argsFromInit.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/argsFromInit.txt index e2876ac271a..0998dd7d906 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/argsFromInit.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/argsFromInit.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] argsFromInit.kts LAZY_super } - init { + [ResolvedTo(BODY_RESOLVE)] init { #( = [ResolvedTo(RAW_FIR)] foo@fun (): R|kotlin/Int| { ^ R|/args|.R|SubstitutionOverride| } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/initializerConflict.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/initializerConflict.txt index 7bc845a012b..38ad2ad97f3 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/initializerConflict.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/initializerConflict.txt @@ -3,7 +3,7 @@ FIR element: FirAnonymousInitializerImpl FIR source kind: KtRealSourceElementKind FIR element rendered: -init { +[ResolvedTo(BODY_RESOLVE)] init { [ResolvedTo(RAW_FIR)] lval i: R|kotlin/Int| = Int(1) } @@ -23,8 +23,8 @@ FILE: [ResolvedTo(IMPORTS)] initializerConflict.kt LAZY_super } - init { + [ResolvedTo(BODY_RESOLVE)] init { [ResolvedTo(RAW_FIR)] lval i: R|kotlin/Int| = Int(1) } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/invalidCode/secondaryConstructor.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/invalidCode/secondaryConstructor.txt index b76092dda10..4d743f86a32 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/invalidCode/secondaryConstructor.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/invalidCode/secondaryConstructor.txt @@ -3,7 +3,7 @@ FIR element: FirDanglingModifierListImpl FIR source kind: DanglingModifierList FIR element rendered: - +[ResolvedTo(BODY_RESOLVE)] FIR FILE: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt @@ -17,5 +17,5 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt public final [ResolvedTo(STATUS)] fun (): R|kotlin/Unit| { LAZY_BLOCK } - + [ResolvedTo(BODY_RESOLVE)] } \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt index a55e49c492c..56907dca94d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt @@ -458,11 +458,13 @@ class FirRenderer( } override fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer) { + resolvePhaseRenderer?.render(anonymousInitializer) print("init") bodyRenderer?.renderBody(anonymousInitializer.body) } override fun visitDanglingModifierList(danglingModifierList: FirDanglingModifierList) { + resolvePhaseRenderer?.render(danglingModifierList) annotationRenderer?.render(danglingModifierList) print("") }