From 7ce5100946d6218364585ad01c7e795feb145f1e Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 8 Jul 2022 17:13:24 +0200 Subject: [PATCH] FirRenderer: slightly change/refactor declaration rendering --- .../innerDeclarationsResolve/class.fir.txt | 2 +- .../constructorParameter.fir.txt | 2 +- .../innerDeclarationsResolve/enum.fir.txt | 2 +- .../functionWithImplicitType.fir.txt | 2 +- .../lambdaInImplicitPropertyBody.fir.txt | 4 +- .../propertyWithGetterAndSetter.fir.txt | 4 +- .../propertyWithSetter.fir.txt | 8 +- .../lazyResolve/annotationParameters.txt | 26 +-- .../testdata/lazyResolve/classMembers.txt | 26 +-- .../testdata/lazyResolve/delegates.txt | 182 +++++++++--------- .../lazyResolve/parameterOfNonLocalSetter.txt | 52 ++--- .../lazyResolve/propertyWithGetter.txt | 26 +-- .../propertyWithGetterAndSetter.txt | 52 ++--- .../lazyResolve/propertyWithInitializer.txt | 26 +-- .../lazyResolve/typeParameterOfTopSetter.txt | 52 ++--- .../onAirResolve/incompleteIdentifier.txt | 2 +- .../onAirResolve/memberPropertyInClass.txt | 2 +- .../rawBuilder/declarations/annotation.txt | 2 +- ...nnotationsOnNullableParenthesizedTypes.txt | 8 +- .../annotationsOnParenthesizedTypes.txt | 10 +- .../rawBuilder/declarations/complexTypes.txt | 2 +- .../propertyAccessorsContractDescription.txt | 12 +- .../rawBuilder/declarations/derivedClass.txt | 2 +- .../rawBuilder/declarations/enums.txt | 10 +- .../rawBuilder/declarations/enums2.txt | 2 +- .../rawBuilder/declarations/external.txt | 4 +- .../rawBuilder/declarations/nestedClass.txt | 2 +- .../declarations/noPrimaryConstructor.txt | 2 +- .../rawBuilder/declarations/simpleClass.txt | 12 +- .../declarations/typeParameterVsNested.txt | 6 +- .../rawBuilder/expressions/annotated.txt | 4 +- .../rawBuilder/expressions/arrayAccess.txt | 2 +- .../expressions/callableReferences.txt | 2 +- .../testData/rawBuilder/expressions/calls.txt | 4 +- .../expressions/collectionLiterals.txt | 6 +- .../rawBuilder/expressions/destructuring.txt | 6 +- .../testData/rawBuilder/expressions/for.txt | 4 +- .../testData/rawBuilder/expressions/init.txt | 2 +- .../rawBuilder/expressions/lambda.txt | 4 +- .../rawBuilder/expressions/locals.txt | 2 +- .../testData/rawBuilder/expressions/these.txt | 2 +- .../testData/rawBuilder/expressions/unary.txt | 4 +- .../fir/renderer/FirDeclarationRenderer.kt | 32 ++- .../kotlin/fir/renderer/FirRenderer.kt | 39 +--- .../fir/renderer/FirValueParameterRenderer.kt | 2 +- 45 files changed, 330 insertions(+), 329 deletions(-) diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.fir.txt index eb29570ce41..758555369e7 100644 --- a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.fir.txt +++ b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.fir.txt @@ -8,7 +8,7 @@ FILE: class.kt } private final [BODY_RESOLVE] val y: = this@R|/B|.R|/B.q|() - [BODY_RESOLVE] private get(): + private [BODY_RESOLVE] get(): public final [BODY_RESOLVE] fun foo([BODY_RESOLVE] a: ): { ^foo #(R|/a|, = [BODY_RESOLVE] with@fun .(): { diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/constructorParameter.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/constructorParameter.fir.txt index e7d2bb5b48b..7f7dc62ac7e 100644 --- a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/constructorParameter.fir.txt +++ b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/constructorParameter.fir.txt @@ -5,6 +5,6 @@ FILE: constructorParameter.kt } public final [BODY_RESOLVE] val x: R|kotlin/String| = R|/x| - [BODY_RESOLVE] public get(): R|kotlin/String| + public [BODY_RESOLVE] get(): R|kotlin/String| } diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.fir.txt index 5c2ea128a6f..24644bd20d5 100644 --- a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.fir.txt +++ b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.fir.txt @@ -5,7 +5,7 @@ FILE: enum.kt } public final [BODY_RESOLVE] val x: R|kotlin/Int| = R|/x| - [BODY_RESOLVE] public get(): R|kotlin/Int| + public [BODY_RESOLVE] get(): R|kotlin/Int| public final static [BODY_RESOLVE] enum entry A: R|Enum| = object : R|Enum| { private [BODY_RESOLVE] constructor(): R|| { diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt index ca0af4be9c6..1120a8b3e1b 100644 --- a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt +++ b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt @@ -3,4 +3,4 @@ FILE: functionWithImplicitType.kt ^checkSubtype R|/t| } public final [BODY_RESOLVE] val ab: R|kotlin/collections/List?| = R|/checkSubtype|?|>(Q|java/util/Collections|.R|java/util/Collections.emptyList|()) - [BODY_RESOLVE] public get(): R|kotlin/collections/List?| + public [BODY_RESOLVE] get(): R|kotlin/collections/List?| diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitPropertyBody.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitPropertyBody.fir.txt index 71e7cbf97ea..a8f42c9c511 100644 --- a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitPropertyBody.fir.txt +++ b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitPropertyBody.fir.txt @@ -11,7 +11,7 @@ FILE: lambdaInImplicitPropertyBody.kt } public final [BODY_RESOLVE] val a: R|kotlin/Int| = Int(10) - [BODY_RESOLVE] public get(): R|kotlin/Int| + public [BODY_RESOLVE] get(): R|kotlin/Int| public final [BODY_RESOLVE] val x: R|kotlin/String| = R|/with|(this@R|/B|.R|/B.a|, = [BODY_RESOLVE] with@fun R|kotlin/Int|.(): R|kotlin/String| { ^ this@R|special/anonymous|.R|kotlin/Int.toString|().R|/let|( = [BODY_RESOLVE] let@fun ([BODY_RESOLVE] it: R|kotlin/String|): R|kotlin/String| { @@ -20,6 +20,6 @@ FILE: lambdaInImplicitPropertyBody.kt ) } ) - [BODY_RESOLVE] public get(): R|kotlin/String| + public [BODY_RESOLVE] get(): R|kotlin/String| } diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithGetterAndSetter.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithGetterAndSetter.fir.txt index 7050cdc1792..b98a76534df 100644 --- a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithGetterAndSetter.fir.txt +++ b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithGetterAndSetter.fir.txt @@ -1,8 +1,8 @@ FILE: propertyWithGetterAndSetter.kt public final [BODY_RESOLVE] var withGetterAndSetter: R|kotlin/Int| = Int(42) - [BODY_RESOLVE] public get(): R|kotlin/Int| { + public [BODY_RESOLVE] get(): R|kotlin/Int| { ^ F|/withGetterAndSetter| } - [BODY_RESOLVE] public set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| { F|/withGetterAndSetter| = R|/value| } diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithSetter.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithSetter.fir.txt index 450b49694c8..d6e8ac36fe4 100644 --- a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithSetter.fir.txt +++ b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithSetter.fir.txt @@ -5,8 +5,8 @@ FILE: propertyWithSetter.kt } public abstract [BODY_RESOLVE] var id: R|kotlin/Int| - [BODY_RESOLVE] public get(): R|kotlin/Int| - [BODY_RESOLVE] protected set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| + public [BODY_RESOLVE] get(): R|kotlin/Int| + protected [BODY_RESOLVE] set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| } public final [BODY_RESOLVE] class Bar : R|Foo| { @@ -15,8 +15,8 @@ FILE: propertyWithSetter.kt } public final override [BODY_RESOLVE] var id: R|kotlin/Int| = Int(1) - [BODY_RESOLVE] public get(): R|kotlin/Int| - [BODY_RESOLVE] public set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| + public [BODY_RESOLVE] get(): R|kotlin/Int| + public [BODY_RESOLVE] set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| } public final [BODY_RESOLVE] fun test(): R|kotlin/Unit| { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt index 2b42b636c5c..6e45500f6fe 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt @@ -20,7 +20,7 @@ FILE: annotationParameters.kt } public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public? final? [RAW_FIR] class B : R|kotlin/Any| { @@ -55,7 +55,7 @@ FILE: annotationParameters.kt } public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public? final? [RAW_FIR] class B : R|kotlin/Any| { @@ -90,7 +90,7 @@ FILE: annotationParameters.kt } public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public? final? [RAW_FIR] class B : R|kotlin/Any| { @@ -125,7 +125,7 @@ FILE: annotationParameters.kt } public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public? final? [RAW_FIR] class B : R|kotlin/Any| { @@ -160,7 +160,7 @@ FILE: annotationParameters.kt } public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public? final? [RAW_FIR] class B : R|kotlin/Any| { @@ -195,7 +195,7 @@ FILE: annotationParameters.kt } public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public? final? [SUPER_TYPES] class B : R|kotlin/Any| { @@ -230,7 +230,7 @@ FILE: annotationParameters.kt } public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public final [SUPER_TYPES] class B : R|kotlin/Any| { @@ -265,7 +265,7 @@ FILE: annotationParameters.kt } public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public final [SUPER_TYPES] class B : R|kotlin/Any| { @@ -300,7 +300,7 @@ FILE: annotationParameters.kt } public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public final [SUPER_TYPES] class B : R|kotlin/Any| { @@ -336,7 +336,7 @@ FILE: annotationParameters.kt } public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public final [STATUS] class B : R|kotlin/Any| { @@ -372,7 +372,7 @@ FILE: annotationParameters.kt } public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public final [STATUS] class B : R|kotlin/Any| { @@ -408,7 +408,7 @@ FILE: annotationParameters.kt } public? final? [SUPER_TYPES] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - [TYPES] [ContainingClassKey=Anno] public? get(): A.X + public? [TYPES] [ContainingClassKey=Anno] get(): A.X } public final [STATUS] class B : R|kotlin/Any| { @@ -444,7 +444,7 @@ FILE: annotationParameters.kt } public final [BODY_RESOLVE] [IsFromPrimaryConstructor=true] val args: = R|/args| - [BODY_RESOLVE] [ContainingClassKey=Anno] public get(): + public [BODY_RESOLVE] [ContainingClassKey=Anno] get(): } public final [BODY_RESOLVE] class B : R|kotlin/Any| { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classMembers.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classMembers.txt index 5cb79d80f89..b754d25b99d 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classMembers.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classMembers.txt @@ -9,7 +9,7 @@ FILE: classMembers.kt public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val x: Int = LAZY_EXPRESSION - [RAW_FIR] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] [ContainingClassKey=A] get(): Int { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK } @@ -27,7 +27,7 @@ FILE: classMembers.kt public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val x: Int = LAZY_EXPRESSION - [RAW_FIR] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] [ContainingClassKey=A] get(): Int { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK } @@ -45,7 +45,7 @@ FILE: classMembers.kt public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val x: Int = LAZY_EXPRESSION - [RAW_FIR] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] [ContainingClassKey=A] get(): Int { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK } @@ -63,7 +63,7 @@ FILE: classMembers.kt public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val x: Int = LAZY_EXPRESSION - [RAW_FIR] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] [ContainingClassKey=A] get(): Int { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK } @@ -81,7 +81,7 @@ FILE: classMembers.kt public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val x: Int = LAZY_EXPRESSION - [RAW_FIR] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] [ContainingClassKey=A] get(): Int { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK } @@ -99,7 +99,7 @@ FILE: classMembers.kt public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [SUPER_TYPES] val x: Int = LAZY_EXPRESSION - [SUPER_TYPES] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK } + public? [SUPER_TYPES] [ContainingClassKey=A] get(): Int { LAZY_BLOCK } public? final? [SUPER_TYPES] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK } @@ -117,7 +117,7 @@ FILE: classMembers.kt public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [SUPER_TYPES] val x: Int = LAZY_EXPRESSION - [SUPER_TYPES] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK } + public? [SUPER_TYPES] [ContainingClassKey=A] get(): Int { LAZY_BLOCK } public? final? [SUPER_TYPES] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK } @@ -135,7 +135,7 @@ FILE: classMembers.kt public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [SUPER_TYPES] val x: Int = LAZY_EXPRESSION - [SUPER_TYPES] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK } + public? [SUPER_TYPES] [ContainingClassKey=A] get(): Int { LAZY_BLOCK } public? final? [SUPER_TYPES] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK } @@ -155,7 +155,7 @@ FILE: classMembers.kt } public? final? [SUPER_TYPES] val x: Int = LAZY_EXPRESSION - [SUPER_TYPES] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK } + public? [SUPER_TYPES] [ContainingClassKey=A] get(): Int { LAZY_BLOCK } public? final? [SUPER_TYPES] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK } @@ -175,7 +175,7 @@ FILE: classMembers.kt } public final [STATUS] val x: R|kotlin/Int| = LAZY_EXPRESSION - [STATUS] [ContainingClassKey=A] public get(): R|kotlin/Int| { LAZY_BLOCK } + public [STATUS] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } public final [STATUS] fun receive([RAW_FIR] value: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -195,7 +195,7 @@ FILE: classMembers.kt } public final [STATUS] val x: R|kotlin/Int| = LAZY_EXPRESSION - [STATUS] [ContainingClassKey=A] public get(): R|kotlin/Int| { LAZY_BLOCK } + public [STATUS] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } public final [STATUS] fun receive([RAW_FIR] value: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -215,7 +215,7 @@ FILE: classMembers.kt } public final [STATUS] val x: R|kotlin/Int| = LAZY_EXPRESSION - [STATUS] [ContainingClassKey=A] public get(): R|kotlin/Int| { LAZY_BLOCK } + public [STATUS] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } public final [CONTRACTS] fun receive([RAW_FIR] value: R|kotlin/String|): R|kotlin/Unit| { } @@ -238,7 +238,7 @@ FILE: classMembers.kt } public final [BODY_RESOLVE] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10) - [BODY_RESOLVE] [ContainingClassKey=A] public get(): R|kotlin/Int| { + public [BODY_RESOLVE] [ContainingClassKey=A] get(): R|kotlin/Int| { ^ this@R|/A|.F|/A.x| } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt b/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt index 1a7a3e05f69..760e11ff403 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt @@ -4,27 +4,27 @@ FILE: delegates.kt public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val delegate: = LAZY_EXPRESSION - [TYPES] public? get(): + public? [TYPES] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public? final? [RAW_FIR] val valueWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|) } public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public? final? [RAW_FIR] var variableWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -33,27 +33,27 @@ FILE: delegates.kt public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val delegate: = LAZY_EXPRESSION - [TYPES] public? get(): + public? [TYPES] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public? final? [RAW_FIR] val valueWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|) } public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public? final? [RAW_FIR] var variableWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -62,27 +62,27 @@ FILE: delegates.kt public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val delegate: = LAZY_EXPRESSION - [TYPES] public? get(): + public? [TYPES] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public? final? [RAW_FIR] val valueWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|) } public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public? final? [RAW_FIR] var variableWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -91,27 +91,27 @@ FILE: delegates.kt public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val delegate: = LAZY_EXPRESSION - [TYPES] public? get(): + public? [TYPES] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public? final? [RAW_FIR] val valueWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|) } public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public? final? [RAW_FIR] var variableWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -120,27 +120,27 @@ FILE: delegates.kt public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val delegate: = LAZY_EXPRESSION - [TYPES] public? get(): + public? [TYPES] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public? final? [RAW_FIR] val valueWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|) } public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public? final? [RAW_FIR] var variableWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -149,27 +149,27 @@ FILE: delegates.kt public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val delegate: = LAZY_EXPRESSION - [TYPES] public? get(): + public? [TYPES] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public? final? [RAW_FIR] val valueWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|) } public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public? final? [RAW_FIR] var variableWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -178,27 +178,27 @@ FILE: delegates.kt public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val delegate: = LAZY_EXPRESSION - [TYPES] public? get(): + public? [TYPES] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public? final? [RAW_FIR] val valueWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|) } public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public? final? [RAW_FIR] var variableWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -207,27 +207,27 @@ FILE: delegates.kt public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val delegate: = LAZY_EXPRESSION - [TYPES] public? get(): + public? [TYPES] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public? final? [RAW_FIR] val valueWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|) } public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public? final? [RAW_FIR] var variableWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -241,27 +241,27 @@ FILE: delegates.kt } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val delegate: = LAZY_EXPRESSION - [TYPES] public? get(): + public? [TYPES] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public? final? [RAW_FIR] val valueWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|) } public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public? final? [RAW_FIR] var variableWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -275,27 +275,27 @@ FILE: delegates.kt } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val delegate: = LAZY_EXPRESSION - [TYPES] public? get(): + public? [TYPES] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public? final? [RAW_FIR] val valueWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|) } public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public? final? [RAW_FIR] var variableWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -309,27 +309,27 @@ FILE: delegates.kt } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val delegate: = LAZY_EXPRESSION - [TYPES] public? get(): + public? [TYPES] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public? final? [RAW_FIR] val valueWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|) } public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public? final? [RAW_FIR] var variableWithImplicitType: by LAZY_EXPRESSION - [RAW_FIR] public? get(): { + public? [RAW_FIR] get(): { ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|) } - [RAW_FIR] public? set([RAW_FIR] : ): R|kotlin/Unit| { + public? [RAW_FIR] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -357,27 +357,27 @@ FILE: delegates.kt } - [BODY_RESOLVE] public get(): R|kotlin/properties/ReadWriteProperty| + public [BODY_RESOLVE] get(): R|kotlin/properties/ReadWriteProperty| public final [CONTRACTS] val valueWithExplicitType: R|kotlin/Int|by delegate# - [CONTRACTS] public get(): { + public [CONTRACTS] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public final [IMPLICIT_TYPES_BODY_RESOLVE] val valueWithImplicitType: R|kotlin/Int|by R|/delegate| - [IMPLICIT_TYPES_BODY_RESOLVE] public get(): R|kotlin/Int| { + public [IMPLICIT_TYPES_BODY_RESOLVE] get(): R|kotlin/Int| { ^ D|/valueWithImplicitType|.R|SubstitutionOverride|(Null(null), ::R|/valueWithImplicitType|) } public final [CONTRACTS] var variableWithExplicitType: R|kotlin/Int|by delegate# - [CONTRACTS] public get(): { + public [CONTRACTS] get(): { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - [CONTRACTS] public set([RAW_FIR] : ): R|kotlin/Unit| { + public [CONTRACTS] set([RAW_FIR] : ): R|kotlin/Unit| { D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public final [IMPLICIT_TYPES_BODY_RESOLVE] var variableWithImplicitType: R|kotlin/Int|by R|/delegate| - [IMPLICIT_TYPES_BODY_RESOLVE] public get(): R|kotlin/Int| { + public [IMPLICIT_TYPES_BODY_RESOLVE] get(): R|kotlin/Int| { ^ D|/variableWithImplicitType|.R|SubstitutionOverride|(Null(null), ::R|/variableWithImplicitType|) } - [IMPLICIT_TYPES_BODY_RESOLVE] public set([RAW_FIR] : R|kotlin/Int|): R|kotlin/Unit| { + public [IMPLICIT_TYPES_BODY_RESOLVE] set([RAW_FIR] : R|kotlin/Int|): R|kotlin/Unit| { D|/variableWithImplicitType|.R|SubstitutionOverride|(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } @@ -405,26 +405,26 @@ FILE: delegates.kt } - [BODY_RESOLVE] public get(): R|kotlin/properties/ReadWriteProperty| + public [BODY_RESOLVE] get(): R|kotlin/properties/ReadWriteProperty| public final [BODY_RESOLVE] val valueWithExplicitType: R|kotlin/Int|by R|/delegate| - [BODY_RESOLVE] public get(): R|kotlin/Int| { + public [BODY_RESOLVE] get(): R|kotlin/Int| { ^ D|/valueWithExplicitType|.R|SubstitutionOverride|(Null(null), ::R|/valueWithExplicitType|) } public final [BODY_RESOLVE] val valueWithImplicitType: R|kotlin/Int|by R|/delegate| - [BODY_RESOLVE] public get(): R|kotlin/Int| { + public [BODY_RESOLVE] get(): R|kotlin/Int| { ^ D|/valueWithImplicitType|.R|SubstitutionOverride|(Null(null), ::R|/valueWithImplicitType|) } public final [BODY_RESOLVE] var variableWithExplicitType: R|kotlin/Int|by R|/delegate| - [BODY_RESOLVE] public get(): R|kotlin/Int| { + public [BODY_RESOLVE] get(): R|kotlin/Int| { ^ D|/variableWithExplicitType|.R|SubstitutionOverride|(Null(null), ::R|/variableWithExplicitType|) } - [BODY_RESOLVE] public set([BODY_RESOLVE] : R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] set([BODY_RESOLVE] : R|kotlin/Int|): R|kotlin/Unit| { D|/variableWithExplicitType|.R|SubstitutionOverride|(Null(null), ::R|/variableWithExplicitType|, R|/variableWithExplicitType|) } public final [BODY_RESOLVE] var variableWithImplicitType: R|kotlin/Int|by R|/delegate| - [BODY_RESOLVE] public get(): R|kotlin/Int| { + public [BODY_RESOLVE] get(): R|kotlin/Int| { ^ D|/variableWithImplicitType|.R|SubstitutionOverride|(Null(null), ::R|/variableWithImplicitType|) } - [BODY_RESOLVE] public set([BODY_RESOLVE] : R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] set([BODY_RESOLVE] : R|kotlin/Int|): R|kotlin/Unit| { D|/variableWithImplicitType|.R|SubstitutionOverride|(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt index 9ac3afc80e8..8724751ece2 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt @@ -7,8 +7,8 @@ FILE: parameterOfNonLocalSetter.kt } public? final? [RAW_FIR] var x: Int = LAZY_EXPRESSION - [TYPES] [ContainingClassKey=X] public? get(): Int - [RAW_FIR] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] [ContainingClassKey=X] get(): Int + public? [RAW_FIR] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } } @@ -20,8 +20,8 @@ FILE: parameterOfNonLocalSetter.kt } public? final? [RAW_FIR] var x: Int = LAZY_EXPRESSION - [TYPES] [ContainingClassKey=X] public? get(): Int - [RAW_FIR] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] [ContainingClassKey=X] get(): Int + public? [RAW_FIR] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } } @@ -33,8 +33,8 @@ FILE: parameterOfNonLocalSetter.kt } public? final? [COMPILER_REQUIRED_ANNOTATIONS] var x: Int = LAZY_EXPRESSION - [TYPES] [ContainingClassKey=X] public? get(): Int - [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] [ContainingClassKey=X] get(): Int + public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } } @@ -46,8 +46,8 @@ FILE: parameterOfNonLocalSetter.kt } public? final? [COMPANION_GENERATION] var x: Int = LAZY_EXPRESSION - [TYPES] [ContainingClassKey=X] public? get(): Int - [COMPANION_GENERATION] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] [ContainingClassKey=X] get(): Int + public? [COMPANION_GENERATION] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } } @@ -59,8 +59,8 @@ FILE: parameterOfNonLocalSetter.kt } public? final? [SUPER_TYPES] var x: Int = LAZY_EXPRESSION - [TYPES] [ContainingClassKey=X] public? get(): Int - [SUPER_TYPES] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] [ContainingClassKey=X] get(): Int + public? [SUPER_TYPES] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } } @@ -72,8 +72,8 @@ FILE: parameterOfNonLocalSetter.kt } public? final? [TYPES] var x: R|kotlin/Int| = LAZY_EXPRESSION - [TYPES] [ContainingClassKey=X] public? get(): R|kotlin/Int| - [TYPES] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] [ContainingClassKey=X] get(): R|kotlin/Int| + public? [TYPES] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } } @@ -85,8 +85,8 @@ FILE: parameterOfNonLocalSetter.kt } public final [STATUS] var x: R|kotlin/Int| = LAZY_EXPRESSION - [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int| - [STATUS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [STATUS] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } } @@ -98,8 +98,8 @@ FILE: parameterOfNonLocalSetter.kt } public final [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = LAZY_EXPRESSION - [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| { LAZY_BLOCK } + public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } } @@ -111,8 +111,8 @@ FILE: parameterOfNonLocalSetter.kt } public final [CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2) - [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int| - [CONTRACTS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [CONTRACTS] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } @@ -126,8 +126,8 @@ FILE: parameterOfNonLocalSetter.kt } public final [IMPLICIT_TYPES_BODY_RESOLVE] var x: R|kotlin/Int| = IntegerLiteral(2) - [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int| - [IMPLICIT_TYPES_BODY_RESOLVE] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [IMPLICIT_TYPES_BODY_RESOLVE] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } @@ -141,8 +141,8 @@ FILE: parameterOfNonLocalSetter.kt } public final [EXPECT_ACTUAL_MATCHING] var x: R|kotlin/Int| = IntegerLiteral(2) - [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int| - [EXPECT_ACTUAL_MATCHING] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [EXPECT_ACTUAL_MATCHING] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } @@ -156,8 +156,8 @@ FILE: parameterOfNonLocalSetter.kt } public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2) - [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int| - [BODY_RESOLVE] [ContainingClassKey=X] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [BODY_RESOLVE] [ContainingClassKey=X] set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Q|kotlin/Unit| } @@ -171,8 +171,8 @@ FILE: parameterOfNonLocalSetter.kt } public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2) - [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int| - [BODY_RESOLVE] [ContainingClassKey=X] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [BODY_RESOLVE] [ContainingClassKey=X] set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Q|kotlin/Unit| } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetter.txt index 2fd0ce68cd0..fcabce658ef 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetter.txt @@ -4,56 +4,56 @@ FILE: propertyWithGetter.kt public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val withGetter: Int - [RAW_FIR] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } IMPORTS: FILE: propertyWithGetter.kt public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val withGetter: Int - [RAW_FIR] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: propertyWithGetter.kt public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val withGetter: Int - [RAW_FIR] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } COMPANION_GENERATION: FILE: propertyWithGetter.kt public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val withGetter: Int - [RAW_FIR] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } SUPER_TYPES: FILE: propertyWithGetter.kt public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val withGetter: Int - [RAW_FIR] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } TYPES: FILE: propertyWithGetter.kt public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val withGetter: Int - [RAW_FIR] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } STATUS: FILE: propertyWithGetter.kt public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val withGetter: Int - [RAW_FIR] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: propertyWithGetter.kt public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val withGetter: Int - [RAW_FIR] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } CONTRACTS: FILE: propertyWithGetter.kt @@ -62,7 +62,7 @@ FILE: propertyWithGetter.kt } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val withGetter: Int - [RAW_FIR] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } IMPLICIT_TYPES_BODY_RESOLVE: FILE: propertyWithGetter.kt @@ -71,7 +71,7 @@ FILE: propertyWithGetter.kt } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val withGetter: Int - [RAW_FIR] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: propertyWithGetter.kt @@ -80,7 +80,7 @@ FILE: propertyWithGetter.kt } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val withGetter: Int - [RAW_FIR] public? get(): Int { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } BODY_RESOLVE: FILE: propertyWithGetter.kt @@ -90,7 +90,7 @@ FILE: propertyWithGetter.kt public final [CONTRACTS] fun receive([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| { } public final [CONTRACTS] val withGetter: R|kotlin/Int| - [CONTRACTS] public get(): R|kotlin/Int| { + public [CONTRACTS] get(): R|kotlin/Int| { ^ IntegerLiteral(42) } @@ -102,6 +102,6 @@ FILE: propertyWithGetter.kt public final [BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| { } public final [BODY_RESOLVE] val withGetter: R|kotlin/Int| - [BODY_RESOLVE] public get(): R|kotlin/Int| { + public [BODY_RESOLVE] get(): R|kotlin/Int| { ^ Int(42) } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetter.txt index 8291fd33a7b..f1374281c69 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetter.txt @@ -4,64 +4,64 @@ FILE: propertyWithGetterAndSetter.kt public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION - [RAW_FIR] public? get(): Int { LAZY_BLOCK } - [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } + public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } IMPORTS: FILE: propertyWithGetterAndSetter.kt public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION - [RAW_FIR] public? get(): Int { LAZY_BLOCK } - [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } + public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: propertyWithGetterAndSetter.kt public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION - [RAW_FIR] public? get(): Int { LAZY_BLOCK } - [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } + public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: FILE: propertyWithGetterAndSetter.kt public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION - [RAW_FIR] public? get(): Int { LAZY_BLOCK } - [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } + public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: FILE: propertyWithGetterAndSetter.kt public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION - [RAW_FIR] public? get(): Int { LAZY_BLOCK } - [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } + public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } TYPES: FILE: propertyWithGetterAndSetter.kt public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION - [RAW_FIR] public? get(): Int { LAZY_BLOCK } - [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } + public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } STATUS: FILE: propertyWithGetterAndSetter.kt public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION - [RAW_FIR] public? get(): Int { LAZY_BLOCK } - [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } + public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: propertyWithGetterAndSetter.kt public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION - [RAW_FIR] public? get(): Int { LAZY_BLOCK } - [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } + public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: FILE: propertyWithGetterAndSetter.kt @@ -71,8 +71,8 @@ FILE: propertyWithGetterAndSetter.kt } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION - [RAW_FIR] public? get(): Int { LAZY_BLOCK } - [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } + public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } IMPLICIT_TYPES_BODY_RESOLVE: FILE: propertyWithGetterAndSetter.kt @@ -82,8 +82,8 @@ FILE: propertyWithGetterAndSetter.kt } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION - [RAW_FIR] public? get(): Int { LAZY_BLOCK } - [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } + public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: propertyWithGetterAndSetter.kt @@ -93,8 +93,8 @@ FILE: propertyWithGetterAndSetter.kt } public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION - [RAW_FIR] public? get(): Int { LAZY_BLOCK } - [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [RAW_FIR] get(): Int { LAZY_BLOCK } + public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK } BODY_RESOLVE: FILE: propertyWithGetterAndSetter.kt @@ -105,10 +105,10 @@ FILE: propertyWithGetterAndSetter.kt public final [CONTRACTS] fun receive([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| { } public final [CONTRACTS] var withGetterAndSetter: R|kotlin/Int| = IntegerLiteral(42) - [CONTRACTS] public get(): R|kotlin/Int| { + public [CONTRACTS] get(): R|kotlin/Int| { ^ field# } - [CONTRACTS] public set([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| { + public [CONTRACTS] set([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| { field# = value# } @@ -121,9 +121,9 @@ FILE: propertyWithGetterAndSetter.kt public final [BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| { } public final [BODY_RESOLVE] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42) - [BODY_RESOLVE] public get(): R|kotlin/Int| { + public [BODY_RESOLVE] get(): R|kotlin/Int| { ^ F|/withGetterAndSetter| } - [BODY_RESOLVE] public set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| { F|/withGetterAndSetter| = R|/value| } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializer.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializer.txt index d58b28d0261..9d5079d9e93 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializer.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializer.txt @@ -3,49 +3,49 @@ RAW_FIR: FILE: propertyWithInitializer.kt public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int + public? [TYPES] get(): Int IMPORTS: FILE: propertyWithInitializer.kt public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int + public? [TYPES] get(): Int COMPILER_REQUIRED_ANNOTATIONS: FILE: propertyWithInitializer.kt public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int + public? [TYPES] get(): Int COMPANION_GENERATION: FILE: propertyWithInitializer.kt public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int + public? [TYPES] get(): Int SUPER_TYPES: FILE: propertyWithInitializer.kt public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int + public? [TYPES] get(): Int TYPES: FILE: propertyWithInitializer.kt public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int + public? [TYPES] get(): Int STATUS: FILE: propertyWithInitializer.kt public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int + public? [TYPES] get(): Int ARGUMENTS_OF_ANNOTATIONS: FILE: propertyWithInitializer.kt public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int + public? [TYPES] get(): Int CONTRACTS: FILE: propertyWithInitializer.kt @@ -53,7 +53,7 @@ FILE: propertyWithInitializer.kt receive#(property#) } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int + public? [TYPES] get(): Int IMPLICIT_TYPES_BODY_RESOLVE: FILE: propertyWithInitializer.kt @@ -61,7 +61,7 @@ FILE: propertyWithInitializer.kt receive#(property#) } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int + public? [TYPES] get(): Int EXPECT_ACTUAL_MATCHING: FILE: propertyWithInitializer.kt @@ -69,7 +69,7 @@ FILE: propertyWithInitializer.kt receive#(property#) } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int + public? [TYPES] get(): Int BODY_RESOLVE: FILE: propertyWithInitializer.kt @@ -77,7 +77,7 @@ FILE: propertyWithInitializer.kt #(R|/property|) } public final [CONTRACTS] val property: R|kotlin/Int| = IntegerLiteral(10) - [BODY_RESOLVE] public get(): R|kotlin/Int| + public [BODY_RESOLVE] get(): R|kotlin/Int| FILE RAW TO BODY: FILE: propertyWithInitializer.kt @@ -85,4 +85,4 @@ FILE: propertyWithInitializer.kt #(R|/property|) } public final [BODY_RESOLVE] val property: R|kotlin/Int| = Int(10) - [BODY_RESOLVE] public get(): R|kotlin/Int| + public [BODY_RESOLVE] get(): R|kotlin/Int| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt index e4794ca366a..49924efb063 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt @@ -2,87 +2,87 @@ RAW_FIR: FILE: typeParameterOfTopSetter.kt public? final? [RAW_FIR] var x: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int - [RAW_FIR] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] get(): Int + public? [RAW_FIR] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } IMPORTS: FILE: typeParameterOfTopSetter.kt public? final? [RAW_FIR] var x: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int - [RAW_FIR] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] get(): Int + public? [RAW_FIR] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: typeParameterOfTopSetter.kt public? final? [COMPILER_REQUIRED_ANNOTATIONS] var x: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int - [COMPILER_REQUIRED_ANNOTATIONS] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] get(): Int + public? [COMPILER_REQUIRED_ANNOTATIONS] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: FILE: typeParameterOfTopSetter.kt public? final? [COMPANION_GENERATION] var x: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int - [COMPANION_GENERATION] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] get(): Int + public? [COMPANION_GENERATION] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: FILE: typeParameterOfTopSetter.kt public? final? [SUPER_TYPES] var x: Int = LAZY_EXPRESSION - [TYPES] public? get(): Int - [SUPER_TYPES] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] get(): Int + public? [SUPER_TYPES] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } TYPES: FILE: typeParameterOfTopSetter.kt public? final? [TYPES] var x: R|kotlin/Int| = LAZY_EXPRESSION - [TYPES] public? get(): R|kotlin/Int| - [TYPES] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public? [TYPES] get(): R|kotlin/Int| + public? [TYPES] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } STATUS: FILE: typeParameterOfTopSetter.kt public final [STATUS] var x: R|kotlin/Int| = LAZY_EXPRESSION - [BODY_RESOLVE] public get(): R|kotlin/Int| - [STATUS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [BODY_RESOLVE] get(): R|kotlin/Int| + public [STATUS] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: typeParameterOfTopSetter.kt public final [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = LAZY_EXPRESSION - [BODY_RESOLVE] public get(): R|kotlin/Int| - [ARGUMENTS_OF_ANNOTATIONS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [BODY_RESOLVE] get(): R|kotlin/Int| + public [ARGUMENTS_OF_ANNOTATIONS] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: FILE: typeParameterOfTopSetter.kt public final [CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2) - [BODY_RESOLVE] public get(): R|kotlin/Int| - [CONTRACTS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] get(): R|kotlin/Int| + public [CONTRACTS] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } IMPLICIT_TYPES_BODY_RESOLVE: FILE: typeParameterOfTopSetter.kt public final [IMPLICIT_TYPES_BODY_RESOLVE] var x: R|kotlin/Int| = IntegerLiteral(2) - [BODY_RESOLVE] public get(): R|kotlin/Int| - [IMPLICIT_TYPES_BODY_RESOLVE] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] get(): R|kotlin/Int| + public [IMPLICIT_TYPES_BODY_RESOLVE] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } EXPECT_ACTUAL_MATCHING: FILE: typeParameterOfTopSetter.kt public final [EXPECT_ACTUAL_MATCHING] var x: R|kotlin/Int| = IntegerLiteral(2) - [BODY_RESOLVE] public get(): R|kotlin/Int| - [EXPECT_ACTUAL_MATCHING] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] get(): R|kotlin/Int| + public [EXPECT_ACTUAL_MATCHING] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } BODY_RESOLVE: FILE: typeParameterOfTopSetter.kt public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2) - [BODY_RESOLVE] public get(): R|kotlin/Int| - [BODY_RESOLVE] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] get(): R|kotlin/Int| + public [BODY_RESOLVE] set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Q|kotlin/Unit| } FILE RAW TO BODY: FILE: typeParameterOfTopSetter.kt public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2) - [BODY_RESOLVE] public get(): R|kotlin/Int| - [BODY_RESOLVE] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { + public [BODY_RESOLVE] get(): R|kotlin/Int| + public [BODY_RESOLVE] set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Q|kotlin/Unit| } diff --git a/analysis/low-level-api-fir/testdata/onAirResolve/incompleteIdentifier.txt b/analysis/low-level-api-fir/testdata/onAirResolve/incompleteIdentifier.txt index d58e2427922..e477b0c5737 100644 --- a/analysis/low-level-api-fir/testdata/onAirResolve/incompleteIdentifier.txt +++ b/analysis/low-level-api-fir/testdata/onAirResolve/incompleteIdentifier.txt @@ -1,2 +1,2 @@ public final [BODY_RESOLVE] val b: R|A.B| - [BODY_RESOLVE] public get(): R|A.B| + public [BODY_RESOLVE] get(): R|A.B| diff --git a/analysis/low-level-api-fir/testdata/onAirResolve/memberPropertyInClass.txt b/analysis/low-level-api-fir/testdata/onAirResolve/memberPropertyInClass.txt index 040fad74bf5..8bf0c2eb5f3 100644 --- a/analysis/low-level-api-fir/testdata/onAirResolve/memberPropertyInClass.txt +++ b/analysis/low-level-api-fir/testdata/onAirResolve/memberPropertyInClass.txt @@ -1,2 +1,2 @@ public final [BODY_RESOLVE] val niewbe: R|kotlin/String| = String(Hello) - [BODY_RESOLVE] public get(): R|kotlin/String| + public [BODY_RESOLVE] get(): R|kotlin/String| diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt index f5a9c9ffbe0..74d64ec4191 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt @@ -17,7 +17,7 @@ FILE: annotation.kt } @base() public? final? [IsFromPrimaryConstructor=true] val x: Int = R|/x| - [ContainingClassKey=correct] public? get(): Int + public? [ContainingClassKey=correct] get(): Int @base() public? [ContainingClassKey=correct] constructor(): R|correct| { this(IntegerLiteral(0)) diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationsOnNullableParenthesizedTypes.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationsOnNullableParenthesizedTypes.txt index 807ed8bd549..f4027e1599d 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationsOnNullableParenthesizedTypes.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationsOnNullableParenthesizedTypes.txt @@ -16,16 +16,16 @@ FILE: annotationsOnNullableParenthesizedTypes.kt public? final? fun returnArgument(): B<@A() C?> public? final? val lambdaType: @A() ( () -> C )? - [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] public? get(): @A() ( () -> C )? + public? [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] get(): @A() ( () -> C )? public? final? val lambdaParameter: ( (@A() C?) -> C ) - [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] public? get(): ( (@A() C?) -> C ) + public? [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] get(): ( (@A() C?) -> C ) public? final? val lambdaReturnValue: ( () -> @A() C? ) - [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] public? get(): ( () -> @A() C? ) + public? [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] get(): ( () -> @A() C? ) public? final? val lambdaReceiver: ( @A() C?.() -> C ) - [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] public? get(): ( @A() C?.() -> C ) + public? [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] get(): ( @A() C?.() -> C ) } @Target(AnnotationTarget#.TYPE#, AnnotationTarget#.TYPE_PARAMETER#) public? final? annotation class A : R|kotlin/Annotation| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationsOnParenthesizedTypes.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationsOnParenthesizedTypes.txt index 48b3d6328db..e5d33c252e6 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationsOnParenthesizedTypes.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotationsOnParenthesizedTypes.txt @@ -16,19 +16,19 @@ FILE: annotationsOnParenthesizedTypes.kt public? final? fun returnArgument(): B<@A() C> public? final? val lambdaType: @A() ( () -> C ) - [ContainingClassKey=AnnotationsOnParenthesizedTypes] public? get(): @A() ( () -> C ) + public? [ContainingClassKey=AnnotationsOnParenthesizedTypes] get(): @A() ( () -> C ) public? final? val lambdaParameter: ( (@A() C) -> C ) - [ContainingClassKey=AnnotationsOnParenthesizedTypes] public? get(): ( (@A() C) -> C ) + public? [ContainingClassKey=AnnotationsOnParenthesizedTypes] get(): ( (@A() C) -> C ) public? final? val lambdaReturnValue: ( () -> @A() C ) - [ContainingClassKey=AnnotationsOnParenthesizedTypes] public? get(): ( () -> @A() C ) + public? [ContainingClassKey=AnnotationsOnParenthesizedTypes] get(): ( () -> @A() C ) public? final? val lambdaReceiver: ( @A() C.() -> C ) - [ContainingClassKey=AnnotationsOnParenthesizedTypes] public? get(): ( @A() C.() -> C ) + public? [ContainingClassKey=AnnotationsOnParenthesizedTypes] get(): ( @A() C.() -> C ) public? final? val lambdaParameterNP: ( (@A() C) -> C ) - [ContainingClassKey=AnnotationsOnParenthesizedTypes] public? get(): ( (@A() C) -> C ) + public? [ContainingClassKey=AnnotationsOnParenthesizedTypes] get(): ( (@A() C) -> C ) } @Target(AnnotationTarget#.TYPE#, AnnotationTarget#.TYPE_PARAMETER#) public? final? annotation class A : R|kotlin/Annotation| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt index ce0b1a941ec..3eed4dc9aab 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt @@ -14,6 +14,6 @@ FILE: complexTypes.kt } public? final? interface Test : R|kotlin/Any| { public? final? val x: a.b.C.D, *> - [ContainingClassKey=Test] public? get(): a.b.C.D, *> + public? [ContainingClassKey=Test] get(): a.b.C.D, *> } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/contracts/newSyntax/propertyAccessorsContractDescription.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/contracts/newSyntax/propertyAccessorsContractDescription.txt index 64b764e892d..40923f3eede 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/contracts/newSyntax/propertyAccessorsContractDescription.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/contracts/newSyntax/propertyAccessorsContractDescription.txt @@ -5,14 +5,14 @@ FILE: propertyAccessorsContractDescription.kt } public? final? var myInt: Int = IntegerLiteral(0) - [ContainingClassKey=MyClass] public? get(): Int + public? [ContainingClassKey=MyClass] get(): Int [Contract description] < returnsNotNull#() > { ^ IntegerLiteral(1) } - [ContainingClassKey=MyClass] public? set(value: Int): R|kotlin/Unit| { + public? [ContainingClassKey=MyClass] set(value: Int): R|kotlin/Unit| { field# = value#.times#(IntegerLiteral(10)) } @@ -23,14 +23,14 @@ FILE: propertyAccessorsContractDescription.kt } public? final? var anotherInt: Int = IntegerLiteral(0) - [ContainingClassKey=AnotherClass] public? get(): Int + public? [ContainingClassKey=AnotherClass] get(): Int [Contract description] < returnsNotNull#() > { ^ IntegerLiteral(1) } - [ContainingClassKey=AnotherClass] public? set(value: Int): R|kotlin/Unit| + public? [ContainingClassKey=AnotherClass] set(value: Int): R|kotlin/Unit| [Contract description] < returns#() > @@ -45,14 +45,14 @@ FILE: propertyAccessorsContractDescription.kt } public? final? var someInt: Int = IntegerLiteral(0) - [ContainingClassKey=SomeClass] public? get(): Int + public? [ContainingClassKey=SomeClass] get(): Int [Contract description] < returnsNotNull#() > { ^ IntegerLiteral(1) } - [ContainingClassKey=SomeClass] public? set(value: Int): R|kotlin/Unit| + public? [ContainingClassKey=SomeClass] set(value: Int): R|kotlin/Unit| [Contract description] < returns#().implies#(!=(value#, Null(null))) > diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt index da30bb1c10d..f4e48ec03fe 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt @@ -5,7 +5,7 @@ FILE: derivedClass.kt } public? final? [IsFromPrimaryConstructor=true] val x: T = R|/x| - [ContainingClassKey=Base] public? get(): T + public? [ContainingClassKey=Base] get(): T } public? final? class Derived : Base { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt index b66d6ecc3d3..6972228bb81 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt @@ -20,10 +20,10 @@ FILE: enums.kt } public? final? [IsFromPrimaryConstructor=true] val m: Double = R|/m| - [ContainingClassKey=Planet] public? get(): Double + public? [ContainingClassKey=Planet] get(): Double internal final? [IsFromPrimaryConstructor=true] val r: Double = R|/r| - [ContainingClassKey=Planet] internal get(): Double + internal [ContainingClassKey=Planet] get(): Double public final static [ContainingClassKey=Planet] enum entry MERCURY: R|Planet| = object : R|Planet| { private [ContainingClassKey=] constructor(): R|| { @@ -59,7 +59,7 @@ FILE: enums.kt } public? final? val g: Double = G#.times#(m#).div#(r#.times#(r#)) - [ContainingClassKey=Planet] public? get(): Double + public? [ContainingClassKey=Planet] get(): Double public? abstract fun sayHello(): R|kotlin/Unit| @@ -69,7 +69,7 @@ FILE: enums.kt } public? final? const val G: = Double(6.67E-11) - [ContainingClassKey=Companion] public? get(): + public? [ContainingClassKey=Companion] get(): } @@ -86,7 +86,7 @@ FILE: enums.kt } public? final? [IsFromPrimaryConstructor=true] val signature: String = R|/signature| - [ContainingClassKey=PseudoInsn] public? get(): String + public? [ContainingClassKey=PseudoInsn] get(): String public final static [ContainingClassKey=PseudoInsn] enum entry FIX_STACK_BEFORE_JUMP: R|PseudoInsn| = object : R|PseudoInsn| { private [ContainingClassKey=] constructor(): R|| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt index 684321383ef..dc80a115584 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt @@ -19,7 +19,7 @@ FILE: enums2.kt } public? final? [IsFromPrimaryConstructor=true] val x: Some = R|/x| - [ContainingClassKey=SomeEnum] public? get(): Some + public? [ContainingClassKey=SomeEnum] get(): Some public final static [ContainingClassKey=SomeEnum] enum entry FIRST: R|SomeEnum| = object : R|SomeEnum| { private [ContainingClassKey=] constructor(): R|| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/external.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/external.txt index d32a5cb65b4..beed7467d90 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/external.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/external.txt @@ -16,8 +16,8 @@ FILE: external.kt public? final? external fun bar(): String public? final? var y: Int - [ContainingClassKey=NotExternal] public? external get(): Int - [ContainingClassKey=NotExternal] public? set(value: Int): R|kotlin/Unit| { + public? external [ContainingClassKey=NotExternal] get(): Int + public? [ContainingClassKey=NotExternal] set(value: Int): R|kotlin/Unit| { } } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt index 96e76f0ca13..ada010f1640 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt @@ -5,7 +5,7 @@ FILE: nestedClass.kt } public? final? [IsFromPrimaryConstructor=true] val s: String = R|/s| - [ContainingClassKey=Base] public? get(): String + public? [ContainingClassKey=Base] get(): String } public? final? class Outer : R|kotlin/Any| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt index 291d79c7e44..e4f9e5f0e0f 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt @@ -1,7 +1,7 @@ FILE: noPrimaryConstructor.kt public? final? class NoPrimary : R|kotlin/Any| { public? final? val x: String - [ContainingClassKey=NoPrimary] public? get(): String + public? [ContainingClassKey=NoPrimary] get(): String public? [ContainingClassKey=NoPrimary] constructor(x: String): R|NoPrimary| { super() diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt index 92e2c238f3f..78c6190be9f 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt @@ -3,7 +3,7 @@ FILE: simpleClass.kt public? final? fun foo(x: Int, y: String): String public? final? val bar: Boolean - [ContainingClassKey=SomeInterface] public? get(): Boolean + public? [ContainingClassKey=SomeInterface] get(): Boolean } public? final? class SomeClass : SomeInterface { @@ -12,22 +12,22 @@ FILE: simpleClass.kt } private final? val baz: = IntegerLiteral(42) - [ContainingClassKey=SomeClass] private get(): + private [ContainingClassKey=SomeClass] get(): public? open? override fun foo(x: Int, y: String): String { ^foo y#.plus#(x#).plus#(baz#) } public? open? override var bar: Boolean - [ContainingClassKey=SomeClass] public? get(): Boolean { + public? [ContainingClassKey=SomeClass] get(): Boolean { ^ Boolean(true) } - [ContainingClassKey=SomeClass] public? set(value: Boolean): R|kotlin/Unit| { + public? [ContainingClassKey=SomeClass] set(value: Boolean): R|kotlin/Unit| { } public? final? lateinit var fau: Double - [ContainingClassKey=SomeClass] public? get(): Double - [ContainingClassKey=SomeClass] public? set(value: Double): R|kotlin/Unit| + public? [ContainingClassKey=SomeClass] get(): Double + public? [ContainingClassKey=SomeClass] set(value: Double): R|kotlin/Unit| } public? final? inline class InlineClass : R|kotlin/Any| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt index 2ae5fe4b5a0..1cf69b710d7 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt @@ -14,15 +14,15 @@ FILE: typeParameterVsNested.kt } public? abstract val x: T - [ContainingClassKey=My] public? get(): T + public? [ContainingClassKey=My] get(): T public? abstract fun foo(arg: T): R|kotlin/Unit| public? abstract val y: My.T - [ContainingClassKey=My] public? get(): My.T + public? [ContainingClassKey=My] get(): My.T public? abstract val z: test.My.T - [ContainingClassKey=My] public? get(): test.My.T + public? [ContainingClassKey=My] get(): test.My.T public? final? class Some : T { public? [ContainingClassKey=Some] constructor(): R|test/My.Some| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/annotated.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/annotated.txt index 5a3ac36435a..087ca863b0f 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/annotated.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/annotated.txt @@ -26,10 +26,10 @@ FILE: annotated.kt } public? final? [IsFromPrimaryConstructor=true] val x: Int = R|/x| - [ContainingClassKey=Two] public? get(): Int + public? [ContainingClassKey=Two] get(): Int public? final? [IsFromPrimaryConstructor=true] val y: Int = R|/y| - [ContainingClassKey=Two] public? get(): Int + public? [ContainingClassKey=Two] get(): Int public final operator fun component1(): Int diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt index 844aeec6e42..08a7475b882 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt @@ -10,7 +10,7 @@ FILE: arrayAccess.kt } public? final? [IsFromPrimaryConstructor=true] val v: IntArray = R|/v| - [ContainingClassKey=Wrapper] public? get(): IntArray + public? [ContainingClassKey=Wrapper] get(): IntArray } public? final? fun test(a: IntArray, w: Wrapper): { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt index b2cbe993b76..52387e87b71 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt @@ -8,7 +8,7 @@ FILE: callableReferences.kt } public? final? val bar: = IntegerLiteral(0) - [ContainingClassKey=A] public? get(): + public? [ContainingClassKey=A] get(): } public? final? fun A.qux(): R|kotlin/Unit| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/calls.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/calls.txt index 644177e8941..ac6e77cf972 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/calls.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/calls.txt @@ -14,8 +14,8 @@ FILE: calls.kt } public? final? [IsFromPrimaryConstructor=true] var x: Int = R|/x| - [ContainingClassKey=My] public? get(): Int - [ContainingClassKey=My] public? set(value: Int): R|kotlin/Unit| + public? [ContainingClassKey=My] get(): Int + public? [ContainingClassKey=My] set(value: Int): R|kotlin/Unit| public? final? operator fun invoke(): { ^invoke x# diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt index 781b29162c4..322c198165b 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt @@ -5,7 +5,7 @@ FILE: collectionLiterals.kt } public? final? [IsFromPrimaryConstructor=true] val arr: IntArray = R|/arr| - [ContainingClassKey=Ann1] public? get(): IntArray + public? [ContainingClassKey=Ann1] get(): IntArray } public? final? annotation class Ann2 : R|kotlin/Annotation| { @@ -14,7 +14,7 @@ FILE: collectionLiterals.kt } public? final? [IsFromPrimaryConstructor=true] val arr: DoubleArray = R|/arr| - [ContainingClassKey=Ann2] public? get(): DoubleArray + public? [ContainingClassKey=Ann2] get(): DoubleArray } public? final? annotation class Ann3 : R|kotlin/Annotation| { @@ -23,7 +23,7 @@ FILE: collectionLiterals.kt } public? final? [IsFromPrimaryConstructor=true] val arr: Array = R|/arr| - [ContainingClassKey=Ann3] public? get(): Array + public? [ContainingClassKey=Ann3] get(): Array } @Ann1(()) @Ann2(()) @Ann3(()) public? final? class Zero : R|kotlin/Any| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt index c428c777ec0..869c98ea720 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt @@ -5,13 +5,13 @@ FILE: destructuring.kt } public? final? [IsFromPrimaryConstructor=true] val first: Int = R|/first| - [ContainingClassKey=Some] public? get(): Int + public? [ContainingClassKey=Some] get(): Int public? final? [IsFromPrimaryConstructor=true] val second: Double = R|/second| - [ContainingClassKey=Some] public? get(): Double + public? [ContainingClassKey=Some] get(): Double public? final? [IsFromPrimaryConstructor=true] val third: String = R|/third| - [ContainingClassKey=Some] public? get(): String + public? [ContainingClassKey=Some] get(): String public final operator fun component1(): Int diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/for.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/for.txt index 91d315860da..412058524e5 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/for.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/for.txt @@ -55,10 +55,10 @@ FILE: for.kt } public? final? [IsFromPrimaryConstructor=true] val x: Int = R|/x| - [ContainingClassKey=Some] public? get(): Int + public? [ContainingClassKey=Some] get(): Int public? final? [IsFromPrimaryConstructor=true] val y: Int = R|/y| - [ContainingClassKey=Some] public? get(): Int + public? [ContainingClassKey=Some] get(): Int public final operator fun component1(): Int diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/init.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/init.txt index f681c3f2988..77d3ad6740b 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/init.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/init.txt @@ -5,7 +5,7 @@ FILE: init.kt } public? final? val x: Int - [ContainingClassKey=WithInit] public? get(): Int + public? [ContainingClassKey=WithInit] get(): Int init { this#.x# = x# diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/lambda.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/lambda.txt index 0ff50f200eb..5d6a71fe781 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/lambda.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/lambda.txt @@ -5,10 +5,10 @@ FILE: lambda.kt } public? final? [IsFromPrimaryConstructor=true] val x: Int = R|/x| - [ContainingClassKey=Tuple] public? get(): Int + public? [ContainingClassKey=Tuple] get(): Int public? final? [IsFromPrimaryConstructor=true] val y: Int = R|/y| - [ContainingClassKey=Tuple] public? get(): Int + public? [ContainingClassKey=Tuple] get(): Int public final operator fun component1(): Int diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt index 25c3c6a4648..c08e2e53418 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt @@ -6,7 +6,7 @@ FILE: locals.kt } public? final? [IsFromPrimaryConstructor=true] val pp: Int = R|/pp| - [ContainingClassKey=Local] public? get(): Int + public? [ContainingClassKey=Local] get(): Int public? final? fun diff(): { ^diff pp#.minus#(p#) diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/these.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/these.txt index 4fcb1071fe4..ba36fa2fab3 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/these.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/these.txt @@ -13,7 +13,7 @@ FILE: these.kt } public? final? val instance: Some - [ContainingClassKey=Some] public? get(): Some { + public? [ContainingClassKey=Some] get(): Some { ^ this@Some# } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/unary.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/unary.txt index 7ce37d68542..cdc728b46b9 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/unary.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/unary.txt @@ -36,7 +36,7 @@ FILE: unary.kt } public? final? [IsFromPrimaryConstructor=true] val i: Int = R|/i| - [ContainingClassKey=X] public? get(): Int + public? [ContainingClassKey=X] get(): Int } public? final? fun test2(x: X): R|kotlin/Unit| { @@ -79,7 +79,7 @@ FILE: unary.kt } public? final? [IsFromPrimaryConstructor=true] val arr: Array = R|/arr| - [ContainingClassKey=Y] public? get(): Array + public? [ContainingClassKey=Y] get(): Array } public? final? fun test4(y: Y): R|kotlin/Unit| { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirDeclarationRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirDeclarationRenderer.kt index 4cf68939fe3..c3501c7c777 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirDeclarationRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirDeclarationRenderer.kt @@ -5,15 +5,45 @@ package org.jetbrains.kotlin.fir.renderer -import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly open class FirDeclarationRenderer { internal lateinit var components: FirRendererComponents protected val printer get() = components.printer private val resolvePhaseRenderer get() = components.resolvePhaseRenderer + private val typeRenderer get() = components.typeRenderer fun render(declaration: FirDeclaration) { + renderPhaseAndAttributes(declaration) + if (declaration is FirConstructor) { + declaration.dispatchReceiverType?.let { + typeRenderer.render(it) + printer.print(".") + } + printer.print("constructor") + return + } + printer.print( + when (declaration) { + is FirRegularClass -> declaration.classKind.name.toLowerCaseAsciiOnly().replace("_", " ") + is FirTypeAlias -> "typealias" + is FirAnonymousFunction -> (declaration.label?.let { "${it.name}@" } ?: "") + "fun" + is FirSimpleFunction -> "fun" + is FirProperty -> { + val prefix = if (declaration.isLocal) "l" else "" + prefix + if (declaration.isVal) "val" else "var" + } + is FirPropertyAccessor -> if (declaration.isGetter) "get" else "set" + is FirField -> "field" + is FirEnumEntry -> "enum entry" + else -> "unknown" + } + ) + } + + internal fun renderPhaseAndAttributes(declaration: FirDeclaration) { resolvePhaseRenderer?.render(declaration) with(declaration) { renderDeclarationAttributes() 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 ebcbce2e423..eb3936ed186 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 @@ -24,7 +24,6 @@ import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.types.Variance -import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly import org.jetbrains.kotlin.utils.addToStdlib.safeAs import java.util.* @@ -243,7 +242,7 @@ class FirRenderer( override fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration) { modifierRenderer.renderModifiers(memberDeclaration) - visitDeclaration(memberDeclaration as FirDeclaration) + declarationRenderer.render(memberDeclaration) when (memberDeclaration) { is FirClassLikeDeclaration -> { if (memberDeclaration is FirRegularClass) { @@ -264,24 +263,6 @@ class FirRenderer( } } - override fun visitDeclaration(declaration: FirDeclaration) { - declarationRenderer.render(declaration) - print( - when (declaration) { - is FirRegularClass -> declaration.classKind.name.toLowerCaseAsciiOnly().replace("_", " ") - is FirTypeAlias -> "typealias" - is FirSimpleFunction -> "fun" - is FirProperty -> { - val prefix = if (declaration.isLocal) "l" else "" - prefix + if (declaration.isVal) "val" else "var" - } - is FirField -> "field" - is FirEnumEntry -> "enum entry" - else -> "unknown" - } - ) - } - override fun visitRegularClass(regularClass: FirRegularClass) { renderContexts(regularClass.contextReceivers) annotationRenderer?.render(regularClass) @@ -356,11 +337,6 @@ class FirRenderer( modifierRenderer.renderModifiers(constructor) declarationRenderer.render(constructor) - constructor.dispatchReceiverType?.let { - typeRenderer.render(it) - print(".") - } - print("constructor") constructor.typeParameters.renderTypeParameters() valueParameterRenderer.renderParameters(constructor.valueParameters) print(": ") @@ -374,10 +350,9 @@ class FirRenderer( } override fun visitPropertyAccessor(propertyAccessor: FirPropertyAccessor) { - declarationRenderer.render(propertyAccessor) annotationRenderer?.render(propertyAccessor) modifierRenderer.renderModifiers(propertyAccessor) - print(if (propertyAccessor.isGetter) "get" else "set") + declarationRenderer.render(propertyAccessor) valueParameterRenderer.renderParameters(propertyAccessor.valueParameters) print(": ") propertyAccessor.returnTypeRef.accept(this) @@ -390,13 +365,9 @@ class FirRenderer( } override fun visitAnonymousFunction(anonymousFunction: FirAnonymousFunction) { - declarationRenderer.render(anonymousFunction) annotationRenderer?.render(anonymousFunction) - val label = anonymousFunction.label - if (label != null) { - print("${label.name}@") - } - print("fun ") + declarationRenderer.render(anonymousFunction) + print(" ") val receiverType = anonymousFunction.receiverTypeRef if (receiverType != null) { receiverType.accept(this) @@ -422,7 +393,7 @@ class FirRenderer( override fun visitFunction(function: FirFunction) { valueParameterRenderer.renderParameters(function.valueParameters) - visitDeclaration(function) + declarationRenderer.render(function) bodyRenderer?.render(function) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirValueParameterRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirValueParameterRenderer.kt index 8ad1ef4c536..1c92063bef2 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirValueParameterRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirValueParameterRenderer.kt @@ -28,7 +28,7 @@ open class FirValueParameterRenderer { } fun renderParameter(valueParameter: FirValueParameter) { - declarationRenderer.render(valueParameter) + declarationRenderer.renderPhaseAndAttributes(valueParameter) annotationRenderer?.render(valueParameter) modifierRenderer.renderModifiers(valueParameter) if (valueParameter.name != SpecialNames.NO_NAME_PROVIDED) {