From e7e9c24473f283471cd826dc5064362d102aa9e0 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 9 Aug 2022 11:15:17 +0200 Subject: [PATCH] [LL FIR] update lazy resolve testdata after changes in phases --- .../lazyResolve/annotationParameters.txt | 24 ++++++------- .../classes/classWithTypeParameters.txt | 36 +++++++++---------- .../testdata/lazyResolve/delegates.txt | 30 ++++++++-------- .../lazyResolve/parameterOfNonLocalSetter.txt | 20 +++++------ .../lazyResolve/propertyWithInitializer.txt | 24 ++++++------- .../typeAliasWithTypeParameters.txt | 18 +++++----- .../lazyResolve/typeParameterOfTopSetter.txt | 20 +++++------ .../testdata/onAirResolve/classInClass.txt | 2 +- 8 files changed, 87 insertions(+), 87 deletions(-) diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt index 8190a98b159..7025798af68 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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [RAW_FIR] [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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [RAW_FIR] [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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [RAW_FIR] [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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [RAW_FIR] [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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [RAW_FIR] [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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [COMPILER_REQUIRED_ANNOTATIONS] [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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [COMPILER_REQUIRED_ANNOTATIONS] [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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [COMPILER_REQUIRED_ANNOTATIONS] [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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [COMPILER_REQUIRED_ANNOTATIONS] [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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [COMPILER_REQUIRED_ANNOTATIONS] [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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [COMPILER_REQUIRED_ANNOTATIONS] [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| - public? [TYPES] [ContainingClassKey=Anno] get(): A.X + public? [SUPER_TYPES] [ContainingClassKey=Anno] get(): A.X } public final [STATUS] class B : R|kotlin/Any| { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParameters.txt index c28c9b1513a..01c3e552a56 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParameters.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParameters.txt @@ -19,8 +19,8 @@ FILE: classWithTypeParameters.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: classWithTypeParameters.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] class ResolveMe<[RAW_FIR] T : Int, [RAW_FIR] K> : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=ResolveMe] constructor<[RAW_FIR] T : Int, [RAW_FIR] K>(): R|ResolveMe| { + public? final? [COMPILER_REQUIRED_ANNOTATIONS] class ResolveMe<[COMPILER_REQUIRED_ANNOTATIONS] T : Int, [COMPILER_REQUIRED_ANNOTATIONS] K> : R|kotlin/Any| { + public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=ResolveMe] constructor<[COMPILER_REQUIRED_ANNOTATIONS] T : Int, [COMPILER_REQUIRED_ANNOTATIONS] K>(): R|ResolveMe| { super() } @@ -28,8 +28,8 @@ FILE: classWithTypeParameters.kt COMPANION_GENERATION: FILE: classWithTypeParameters.kt - public? final? [COMPANION_GENERATION] class ResolveMe<[RAW_FIR] T : Int, [RAW_FIR] K> : R|kotlin/Any| { - public? [COMPANION_GENERATION] [ContainingClassKey=ResolveMe] constructor<[RAW_FIR] T : Int, [RAW_FIR] K>(): R|ResolveMe| { + public? final? [COMPANION_GENERATION] class ResolveMe<[COMPANION_GENERATION] T : Int, [COMPANION_GENERATION] K> : R|kotlin/Any| { + public? [COMPANION_GENERATION] [ContainingClassKey=ResolveMe] constructor<[COMPANION_GENERATION] T : Int, [COMPANION_GENERATION] K>(): R|ResolveMe| { super() } @@ -37,8 +37,8 @@ FILE: classWithTypeParameters.kt SUPER_TYPES: FILE: classWithTypeParameters.kt - public? final? [SUPER_TYPES] class ResolveMe<[RAW_FIR] T : Int, [RAW_FIR] K> : R|kotlin/Any| { - public? [SUPER_TYPES] [ContainingClassKey=ResolveMe] constructor<[RAW_FIR] T : Int, [RAW_FIR] K>(): R|ResolveMe| { + public? final? [SUPER_TYPES] class ResolveMe<[SUPER_TYPES] T : Int, [SUPER_TYPES] K> : R|kotlin/Any| { + public? [SUPER_TYPES] [ContainingClassKey=ResolveMe] constructor<[SUPER_TYPES] T : Int, [SUPER_TYPES] K>(): R|ResolveMe| { super() } @@ -46,8 +46,8 @@ FILE: classWithTypeParameters.kt TYPES: FILE: classWithTypeParameters.kt - public? final? [TYPES] class ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> : R|kotlin/Any| { - public? [TYPES] [ContainingClassKey=ResolveMe] constructor<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K>(): R|ResolveMe| { + public? final? [TYPES] class ResolveMe<[TYPES] T : R|kotlin/Int|, [TYPES] K> : R|kotlin/Any| { + public? [TYPES] [ContainingClassKey=ResolveMe] constructor<[TYPES] T : R|kotlin/Int|, [TYPES] K>(): R|ResolveMe| { super() } @@ -55,8 +55,8 @@ FILE: classWithTypeParameters.kt STATUS: FILE: classWithTypeParameters.kt - public final [STATUS] class ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> : R|kotlin/Any| { - public [STATUS] [ContainingClassKey=ResolveMe] constructor<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K>(): R|ResolveMe| { + public final [STATUS] class ResolveMe<[STATUS] T : R|kotlin/Int|, [STATUS] K> : R|kotlin/Any| { + public [STATUS] [ContainingClassKey=ResolveMe] constructor<[STATUS] T : R|kotlin/Int|, [STATUS] K>(): R|ResolveMe| { super() } @@ -64,8 +64,8 @@ FILE: classWithTypeParameters.kt ARGUMENTS_OF_ANNOTATIONS: FILE: classWithTypeParameters.kt - public final [ARGUMENTS_OF_ANNOTATIONS] class ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> : R|kotlin/Any| { - public [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=ResolveMe] constructor<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K>(): R|ResolveMe| { + public final [ARGUMENTS_OF_ANNOTATIONS] class ResolveMe<[ARGUMENTS_OF_ANNOTATIONS] T : R|kotlin/Int|, [ARGUMENTS_OF_ANNOTATIONS] K> : R|kotlin/Any| { + public [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=ResolveMe] constructor<[ARGUMENTS_OF_ANNOTATIONS] T : R|kotlin/Int|, [ARGUMENTS_OF_ANNOTATIONS] K>(): R|ResolveMe| { super() } @@ -73,8 +73,8 @@ FILE: classWithTypeParameters.kt CONTRACTS: FILE: classWithTypeParameters.kt - public final [CONTRACTS] class ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> : R|kotlin/Any| { - public [CONTRACTS] [ContainingClassKey=ResolveMe] constructor<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K>(): R|ResolveMe| { + public final [CONTRACTS] class ResolveMe<[CONTRACTS] T : R|kotlin/Int|, [CONTRACTS] K> : R|kotlin/Any| { + public [CONTRACTS] [ContainingClassKey=ResolveMe] constructor<[CONTRACTS] T : R|kotlin/Int|, [CONTRACTS] K>(): R|ResolveMe| { super() } @@ -82,8 +82,8 @@ FILE: classWithTypeParameters.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: classWithTypeParameters.kt - public final [IMPLICIT_TYPES_BODY_RESOLVE] class ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> : R|kotlin/Any| { - public [IMPLICIT_TYPES_BODY_RESOLVE] [ContainingClassKey=ResolveMe] constructor<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K>(): R|ResolveMe| { + public final [IMPLICIT_TYPES_BODY_RESOLVE] class ResolveMe<[IMPLICIT_TYPES_BODY_RESOLVE] T : R|kotlin/Int|, [IMPLICIT_TYPES_BODY_RESOLVE] K> : R|kotlin/Any| { + public [IMPLICIT_TYPES_BODY_RESOLVE] [ContainingClassKey=ResolveMe] constructor<[IMPLICIT_TYPES_BODY_RESOLVE] T : R|kotlin/Int|, [IMPLICIT_TYPES_BODY_RESOLVE] K>(): R|ResolveMe| { super() } @@ -91,8 +91,8 @@ FILE: classWithTypeParameters.kt EXPECT_ACTUAL_MATCHING: FILE: classWithTypeParameters.kt - public final [EXPECT_ACTUAL_MATCHING] class ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> : R|kotlin/Any| { - public [EXPECT_ACTUAL_MATCHING] [ContainingClassKey=ResolveMe] constructor<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K>(): R|ResolveMe| { + public final [EXPECT_ACTUAL_MATCHING] class ResolveMe<[EXPECT_ACTUAL_MATCHING] T : R|kotlin/Int|, [EXPECT_ACTUAL_MATCHING] K> : R|kotlin/Any| { + public [EXPECT_ACTUAL_MATCHING] [ContainingClassKey=ResolveMe] constructor<[EXPECT_ACTUAL_MATCHING] T : R|kotlin/Int|, [EXPECT_ACTUAL_MATCHING] K>(): R|ResolveMe| { super() } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt b/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt index ac372642e4d..59d960af472 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt @@ -4,7 +4,7 @@ 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 - public? [TYPES] get(): + public? [RAW_FIR] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) @@ -33,7 +33,7 @@ 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 - public? [TYPES] get(): + public? [RAW_FIR] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) @@ -62,7 +62,7 @@ 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 - public? [TYPES] get(): + public? [RAW_FIR] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) @@ -91,7 +91,7 @@ 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 - public? [TYPES] get(): + public? [RAW_FIR] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) @@ -120,7 +120,7 @@ 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 - public? [TYPES] get(): + public? [RAW_FIR] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) @@ -149,7 +149,7 @@ 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 - public? [TYPES] get(): + public? [RAW_FIR] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) @@ -178,7 +178,7 @@ 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 - public? [TYPES] get(): + public? [RAW_FIR] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) @@ -207,7 +207,7 @@ 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 - public? [TYPES] get(): + public? [RAW_FIR] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) @@ -241,7 +241,7 @@ 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 - public? [TYPES] get(): + public? [RAW_FIR] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) @@ -275,7 +275,7 @@ 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 - public? [TYPES] get(): + public? [RAW_FIR] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) @@ -309,7 +309,7 @@ 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 - public? [TYPES] get(): + public? [RAW_FIR] get(): public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION public? [RAW_FIR] get(): { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) @@ -357,9 +357,9 @@ FILE: delegates.kt } - public [BODY_RESOLVE] get(): R|kotlin/properties/ReadWriteProperty| + public [CONTRACTS] get(): R|kotlin/properties/ReadWriteProperty| public final [CONTRACTS] val valueWithExplicitType: R|kotlin/Int|by delegate# - public [CONTRACTS] get(): { + public [CONTRACTS] get(): R|kotlin/Int| { ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|) } public final [IMPLICIT_TYPES_BODY_RESOLVE] val valueWithImplicitType: R|kotlin/Int|by R|/delegate| @@ -367,10 +367,10 @@ FILE: delegates.kt ^ D|/valueWithImplicitType|.R|SubstitutionOverride|(Null(null), ::R|/valueWithImplicitType|) } public final [CONTRACTS] var variableWithExplicitType: R|kotlin/Int|by delegate# - public [CONTRACTS] get(): { + public [CONTRACTS] get(): R|kotlin/Int| { ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|) } - public [CONTRACTS] set([CONTRACTS] : ): R|kotlin/Unit| { + public [CONTRACTS] set([CONTRACTS] : R|kotlin/Int|): 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| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt index e1a3d74a943..11628cddec2 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt @@ -7,7 +7,7 @@ FILE: parameterOfNonLocalSetter.kt } public? final? [RAW_FIR] var x: Int = LAZY_EXPRESSION - public? [TYPES] [ContainingClassKey=X] get(): Int + public? [RAW_FIR] [ContainingClassKey=X] get(): Int public? [RAW_FIR] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } } @@ -20,7 +20,7 @@ FILE: parameterOfNonLocalSetter.kt } public? final? [RAW_FIR] var x: Int = LAZY_EXPRESSION - public? [TYPES] [ContainingClassKey=X] get(): Int + public? [RAW_FIR] [ContainingClassKey=X] get(): Int public? [RAW_FIR] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } } @@ -33,7 +33,7 @@ FILE: parameterOfNonLocalSetter.kt } public? final? [COMPILER_REQUIRED_ANNOTATIONS] var x: Int = LAZY_EXPRESSION - public? [TYPES] [ContainingClassKey=X] get(): Int + public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=X] get(): Int public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=X] set([COMPILER_REQUIRED_ANNOTATIONS] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } } @@ -46,7 +46,7 @@ FILE: parameterOfNonLocalSetter.kt } public? final? [COMPANION_GENERATION] var x: Int = LAZY_EXPRESSION - public? [TYPES] [ContainingClassKey=X] get(): Int + public? [COMPANION_GENERATION] [ContainingClassKey=X] get(): Int public? [COMPANION_GENERATION] [ContainingClassKey=X] set([COMPANION_GENERATION] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } } @@ -59,7 +59,7 @@ FILE: parameterOfNonLocalSetter.kt } public? final? [SUPER_TYPES] var x: Int = LAZY_EXPRESSION - public? [TYPES] [ContainingClassKey=X] get(): Int + public? [SUPER_TYPES] [ContainingClassKey=X] get(): Int public? [SUPER_TYPES] [ContainingClassKey=X] set([SUPER_TYPES] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } } @@ -85,7 +85,7 @@ FILE: parameterOfNonLocalSetter.kt } public final [STATUS] var x: R|kotlin/Int| = LAZY_EXPRESSION - public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [STATUS] [ContainingClassKey=X] get(): R|kotlin/Int| public [STATUS] [ContainingClassKey=X] set([STATUS] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } } @@ -98,7 +98,7 @@ FILE: parameterOfNonLocalSetter.kt } public final [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = LAZY_EXPRESSION - public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=X] get(): R|kotlin/Int| public [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=X] set([ARGUMENTS_OF_ANNOTATIONS] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } } @@ -111,7 +111,7 @@ FILE: parameterOfNonLocalSetter.kt } public final [CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2) - public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [CONTRACTS] [ContainingClassKey=X] get(): R|kotlin/Int| public [CONTRACTS] [ContainingClassKey=X] set([CONTRACTS] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } @@ -126,7 +126,7 @@ FILE: parameterOfNonLocalSetter.kt } public final [IMPLICIT_TYPES_BODY_RESOLVE] var x: R|kotlin/Int| = IntegerLiteral(2) - public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [IMPLICIT_TYPES_BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| public [IMPLICIT_TYPES_BODY_RESOLVE] [ContainingClassKey=X] set([IMPLICIT_TYPES_BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } @@ -141,7 +141,7 @@ FILE: parameterOfNonLocalSetter.kt } public final [EXPECT_ACTUAL_MATCHING] var x: R|kotlin/Int| = IntegerLiteral(2) - public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int| + public [EXPECT_ACTUAL_MATCHING] [ContainingClassKey=X] get(): R|kotlin/Int| public [EXPECT_ACTUAL_MATCHING] [ContainingClassKey=X] set([EXPECT_ACTUAL_MATCHING] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializer.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializer.txt index 9d5079d9e93..8c1389a9a01 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 - public? [TYPES] get(): Int + public? [RAW_FIR] 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 - public? [TYPES] get(): Int + public? [RAW_FIR] 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 - public? [TYPES] get(): Int + public? [RAW_FIR] 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 - public? [TYPES] get(): Int + public? [RAW_FIR] 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 - public? [TYPES] get(): Int + public? [RAW_FIR] 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 - public? [TYPES] get(): Int + public? [RAW_FIR] 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 - public? [TYPES] get(): Int + public? [RAW_FIR] 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 - public? [TYPES] get(): Int + public? [RAW_FIR] get(): Int CONTRACTS: FILE: propertyWithInitializer.kt @@ -53,7 +53,7 @@ FILE: propertyWithInitializer.kt receive#(property#) } public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION - public? [TYPES] get(): Int + public? [RAW_FIR] 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 - public? [TYPES] get(): Int + public? [RAW_FIR] 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 - public? [TYPES] get(): Int + public? [RAW_FIR] 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) - public [BODY_RESOLVE] get(): R|kotlin/Int| + public [CONTRACTS] get(): R|kotlin/Int| FILE RAW TO BODY: FILE: propertyWithInitializer.kt diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt index 790aa034be8..663ced3f934 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt @@ -9,39 +9,39 @@ FILE: typeAliasWithTypeParameters.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: typeAliasWithTypeParameters.kt - public? final [COMPILER_REQUIRED_ANNOTATIONS] typealias ResolveMe<[RAW_FIR] T : Int, [RAW_FIR] K> = Map + public? final [COMPILER_REQUIRED_ANNOTATIONS] typealias ResolveMe<[COMPILER_REQUIRED_ANNOTATIONS] T : Int, [COMPILER_REQUIRED_ANNOTATIONS] K> = Map COMPANION_GENERATION: FILE: typeAliasWithTypeParameters.kt - public? final [COMPANION_GENERATION] typealias ResolveMe<[RAW_FIR] T : Int, [RAW_FIR] K> = Map + public? final [COMPANION_GENERATION] typealias ResolveMe<[COMPANION_GENERATION] T : Int, [COMPANION_GENERATION] K> = Map SUPER_TYPES: FILE: typeAliasWithTypeParameters.kt - public? final [SUPER_TYPES] typealias ResolveMe<[RAW_FIR] T : Int, [RAW_FIR] K> = R|kotlin/collections/Map| + public? final [SUPER_TYPES] typealias ResolveMe<[SUPER_TYPES] T : Int, [SUPER_TYPES] K> = R|kotlin/collections/Map| TYPES: FILE: typeAliasWithTypeParameters.kt - public? final [TYPES] typealias ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> = R|kotlin/collections/Map| + public? final [TYPES] typealias ResolveMe<[TYPES] T : R|kotlin/Int|, [TYPES] K> = R|kotlin/collections/Map| STATUS: FILE: typeAliasWithTypeParameters.kt - public final [STATUS] typealias ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> = R|kotlin/collections/Map| + public final [STATUS] typealias ResolveMe<[STATUS] T : R|kotlin/Int|, [STATUS] K> = R|kotlin/collections/Map| ARGUMENTS_OF_ANNOTATIONS: FILE: typeAliasWithTypeParameters.kt - public final [ARGUMENTS_OF_ANNOTATIONS] typealias ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> = R|kotlin/collections/Map| + public final [ARGUMENTS_OF_ANNOTATIONS] typealias ResolveMe<[ARGUMENTS_OF_ANNOTATIONS] T : R|kotlin/Int|, [ARGUMENTS_OF_ANNOTATIONS] K> = R|kotlin/collections/Map| CONTRACTS: FILE: typeAliasWithTypeParameters.kt - public final [CONTRACTS] typealias ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> = R|kotlin/collections/Map| + public final [CONTRACTS] typealias ResolveMe<[CONTRACTS] T : R|kotlin/Int|, [CONTRACTS] K> = R|kotlin/collections/Map| IMPLICIT_TYPES_BODY_RESOLVE: FILE: typeAliasWithTypeParameters.kt - public final [IMPLICIT_TYPES_BODY_RESOLVE] typealias ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> = R|kotlin/collections/Map| + public final [IMPLICIT_TYPES_BODY_RESOLVE] typealias ResolveMe<[IMPLICIT_TYPES_BODY_RESOLVE] T : R|kotlin/Int|, [IMPLICIT_TYPES_BODY_RESOLVE] K> = R|kotlin/collections/Map| EXPECT_ACTUAL_MATCHING: FILE: typeAliasWithTypeParameters.kt - public final [EXPECT_ACTUAL_MATCHING] typealias ResolveMe<[RAW_FIR] T : R|kotlin/Int|, [RAW_FIR] K> = R|kotlin/collections/Map| + public final [EXPECT_ACTUAL_MATCHING] typealias ResolveMe<[EXPECT_ACTUAL_MATCHING] T : R|kotlin/Int|, [EXPECT_ACTUAL_MATCHING] K> = R|kotlin/collections/Map| BODY_RESOLVE: FILE: typeAliasWithTypeParameters.kt diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt index 4edff4308e5..0fe43e5953d 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt @@ -2,31 +2,31 @@ RAW_FIR: FILE: typeParameterOfTopSetter.kt public? final? [RAW_FIR] var x: Int = LAZY_EXPRESSION - public? [TYPES] get(): Int + public? [RAW_FIR] 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 - public? [TYPES] get(): Int + public? [RAW_FIR] 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 - public? [TYPES] get(): Int + public? [COMPILER_REQUIRED_ANNOTATIONS] get(): Int public? [COMPILER_REQUIRED_ANNOTATIONS] set([COMPILER_REQUIRED_ANNOTATIONS] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: FILE: typeParameterOfTopSetter.kt public? final? [COMPANION_GENERATION] var x: Int = LAZY_EXPRESSION - public? [TYPES] get(): Int + public? [COMPANION_GENERATION] get(): Int public? [COMPANION_GENERATION] set([COMPANION_GENERATION] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: FILE: typeParameterOfTopSetter.kt public? final? [SUPER_TYPES] var x: Int = LAZY_EXPRESSION - public? [TYPES] get(): Int + public? [SUPER_TYPES] get(): Int public? [SUPER_TYPES] set([SUPER_TYPES] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } TYPES: @@ -38,19 +38,19 @@ FILE: typeParameterOfTopSetter.kt STATUS: FILE: typeParameterOfTopSetter.kt public final [STATUS] var x: R|kotlin/Int| = LAZY_EXPRESSION - public [BODY_RESOLVE] get(): R|kotlin/Int| + public [STATUS] get(): R|kotlin/Int| public [STATUS] set([STATUS] 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 - public [BODY_RESOLVE] get(): R|kotlin/Int| + public [ARGUMENTS_OF_ANNOTATIONS] get(): R|kotlin/Int| public [ARGUMENTS_OF_ANNOTATIONS] set([ARGUMENTS_OF_ANNOTATIONS] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: FILE: typeParameterOfTopSetter.kt public final [CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2) - public [BODY_RESOLVE] get(): R|kotlin/Int| + public [CONTRACTS] get(): R|kotlin/Int| public [CONTRACTS] set([CONTRACTS] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } @@ -58,7 +58,7 @@ FILE: typeParameterOfTopSetter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: typeParameterOfTopSetter.kt public final [IMPLICIT_TYPES_BODY_RESOLVE] var x: R|kotlin/Int| = IntegerLiteral(2) - public [BODY_RESOLVE] get(): R|kotlin/Int| + public [IMPLICIT_TYPES_BODY_RESOLVE] get(): R|kotlin/Int| public [IMPLICIT_TYPES_BODY_RESOLVE] set([IMPLICIT_TYPES_BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } @@ -66,7 +66,7 @@ FILE: typeParameterOfTopSetter.kt EXPECT_ACTUAL_MATCHING: FILE: typeParameterOfTopSetter.kt public final [EXPECT_ACTUAL_MATCHING] var x: R|kotlin/Int| = IntegerLiteral(2) - public [BODY_RESOLVE] get(): R|kotlin/Int| + public [EXPECT_ACTUAL_MATCHING] get(): R|kotlin/Int| public [EXPECT_ACTUAL_MATCHING] set([EXPECT_ACTUAL_MATCHING] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { ^ Unit# } diff --git a/analysis/low-level-api-fir/testdata/onAirResolve/classInClass.txt b/analysis/low-level-api-fir/testdata/onAirResolve/classInClass.txt index 568ea03436c..5d809a94bf5 100644 --- a/analysis/low-level-api-fir/testdata/onAirResolve/classInClass.txt +++ b/analysis/low-level-api-fir/testdata/onAirResolve/classInClass.txt @@ -1,4 +1,4 @@ -public final inner [BODY_RESOLVE] class ONAIR<[RAW_FIR] T> : R|X.BASE| { +public final inner [BODY_RESOLVE] class ONAIR<[STATUS] T> : R|X.BASE| { public [BODY_RESOLVE] X.constructor(): R|X.ONAIR| { super() }