From 6c1f5b7a742cdc6ac1d51c16457eff327c6127aa Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Tue, 21 Nov 2023 15:19:12 +0100 Subject: [PATCH] [FIR] PsiRawFirBuilder: reuse type for copy from generated property Previously, this call was required to avoid sharing to have independent instances with their own resolution cycle. Now we will have stable order (in the next commit), so it is possible to share instances. Also, this change makes the logic consistency with Light Tree ^KT-63042 --- ...meterTypeCollisionAndAnnotations.after.txt | 2 +- ...eterTypeCollisionAndAnnotations.before.txt | 2 +- ...ypeCollisionAndAnnotations.lazyResolve.txt | 6 +-- ...ypeCollisionAndAnnotationsScript.after.txt | 2 +- ...peCollisionAndAnnotationsScript.before.txt | 2 +- ...lisionAndAnnotationsScript.lazyResolve.txt | 6 +-- ...nent1TypeCollisionAndAnnotations.after.txt | 2 +- ...ent1TypeCollisionAndAnnotations.before.txt | 2 +- ...ypeCollisionAndAnnotations.lazyResolve.txt | 6 +-- ...ypeCollisionAndAnnotationsScript.after.txt | 2 +- ...peCollisionAndAnnotationsScript.before.txt | 2 +- ...lisionAndAnnotationsScript.lazyResolve.txt | 6 +-- .../copyTypeCollisionAndAnnotations.after.txt | 14 +++---- ...copyTypeCollisionAndAnnotations.before.txt | 14 +++---- ...ypeCollisionAndAnnotations.lazyResolve.txt | 42 +++++++++---------- ...ypeCollisionAndAnnotationsScript.after.txt | 14 +++---- ...peCollisionAndAnnotationsScript.before.txt | 14 +++---- ...lisionAndAnnotationsScript.lazyResolve.txt | 42 +++++++++---------- .../function/generatedComponentN.after.txt | 2 +- .../function/generatedComponentN.before.txt | 2 +- .../generatedComponentN.lazyResolve.txt | 6 +-- .../generatedComponentNScript.after.txt | 2 +- .../generatedComponentNScript.before.txt | 2 +- .../generatedComponentNScript.lazyResolve.txt | 6 +-- .../function/generatedCopy.after.txt | 14 +++---- .../function/generatedCopy.before.txt | 14 +++---- .../function/generatedCopy.lazyResolve.txt | 42 +++++++++---------- .../function/generatedCopyScript.after.txt | 15 +++---- .../function/generatedCopyScript.before.txt | 15 +++---- .../generatedCopyScript.lazyResolve.txt | 42 +++++++++---------- ...pertyTypeCollisionAndAnnotations.after.txt | 2 +- ...ertyTypeCollisionAndAnnotations.before.txt | 2 +- ...ypeCollisionAndAnnotations.lazyResolve.txt | 6 +-- ...ypeCollisionAndAnnotationsScript.after.txt | 2 +- ...peCollisionAndAnnotationsScript.before.txt | 2 +- ...lisionAndAnnotationsScript.lazyResolve.txt | 6 +-- .../kotlin/fir/builder/PsiRawFirBuilder.kt | 20 +-------- 37 files changed, 183 insertions(+), 199 deletions(-) diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt index 0b856dc983b..2db37b3655b 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt @@ -55,6 +55,6 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.before.txt index 54aa3177b91..ffdc56b3601 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.before.txt @@ -55,6 +55,6 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.lazyResolve.txt index db6a47d7a33..e102e085d39 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.lazyResolve.txt @@ -294,7 +294,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } @@ -544,7 +544,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } @@ -594,7 +594,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt index 32db80648f1..6fb06ac33d0 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt @@ -62,7 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.before.txt index 10ba6458737..1646f8ab7f8 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.before.txt @@ -62,7 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.lazyResolve.txt index bafabbe870d..79e1212be30 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.lazyResolve.txt @@ -341,7 +341,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } @@ -631,7 +631,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } @@ -689,7 +689,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.after.txt index 5a0371a3b04..82175e91801 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.after.txt @@ -60,6 +60,6 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotations.kt public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.before.txt index f4cddca05a1..4936e35eeb6 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.before.txt @@ -60,6 +60,6 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotations.kt public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(RAW_FIR)] prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(RAW_FIR)] prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.lazyResolve.txt index 5a6b61a0bcc..30535b5d8cb 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.lazyResolve.txt @@ -324,7 +324,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotations.kt public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(RAW_FIR)] prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(RAW_FIR)] prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| } @@ -599,7 +599,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotations.kt public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| } @@ -654,7 +654,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotations.kt public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.after.txt index 0f7f0aae9c6..0c420856f90 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.after.txt @@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotationsScript.kts public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.before.txt index a9bd0c7d3df..f7fba1d0e8b 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.before.txt @@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotationsScript.kts public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(RAW_FIR)] prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(RAW_FIR)] prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.lazyResolve.txt index 16141be7e1e..0633cbe6fe3 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.lazyResolve.txt @@ -371,7 +371,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotationsScript.kts public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(RAW_FIR)] prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(RAW_FIR)] prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| } @@ -686,7 +686,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotationsScript.kts public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| } @@ -749,7 +749,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotationsScript.kts public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.after.txt index 66be08c5358..3974a5608d4 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.after.txt @@ -41,15 +41,15 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt } public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = R|/prop1| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop1| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = R|/prop2| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop2| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass| { @@ -68,9 +68,9 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt } - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.before.txt index 919c4768e9b..01a7a6ce41a 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.before.txt @@ -41,15 +41,15 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt } public? final? data [ResolvedTo(TYPES)] class MyDataClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|one/two/MyDataClass| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|>): R|one/two/MyDataClass| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/prop1| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = R|/prop1| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/prop2| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> = R|/prop2| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass| { @@ -68,9 +68,9 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt } - public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> public final [ResolvedTo(TYPES)] fun copy([ResolvedTo(TYPES)] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(TYPES)] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.lazyResolve.txt index 9a3e9e20974..669e964c6fc 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.lazyResolve.txt @@ -293,15 +293,15 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt } public? final? data [ResolvedTo(TYPES)] class MyDataClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|one/two/MyDataClass| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|>): R|one/two/MyDataClass| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/prop1| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = R|/prop1| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/prop2| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> = R|/prop2| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass| { @@ -320,9 +320,9 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt } - public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> public final [ResolvedTo(TYPES)] fun copy([ResolvedTo(TYPES)] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(TYPES)] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| @@ -568,15 +568,15 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt } public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = R|/prop1| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop1| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = R|/prop2| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop2| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass| { @@ -595,9 +595,9 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt } - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| @@ -623,15 +623,15 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt } public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } - public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = R|/prop1| - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop1| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = R|/prop2| - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop2| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass| { @@ -650,9 +650,9 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt } - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public final [ResolvedTo(BODY_RESOLVE)] fun copy([ResolvedTo(BODY_RESOLVE)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(BODY_RESOLVE)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.after.txt index 82813f098bd..09950307b57 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.after.txt @@ -48,15 +48,15 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts } public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = R|/prop1| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop1| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = R|/prop2| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop2| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass| { @@ -75,9 +75,9 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts } - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.before.txt index 8e5d5ec737f..428a10bd288 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.before.txt @@ -48,15 +48,15 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts } public? final? data [ResolvedTo(TYPES)] class MyDataClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|one/two/MyDataClass| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|>): R|one/two/MyDataClass| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/prop1| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = R|/prop1| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/prop2| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> = R|/prop2| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass| { @@ -75,9 +75,9 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts } - public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> public final [ResolvedTo(TYPES)] fun copy([ResolvedTo(TYPES)] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(TYPES)] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.lazyResolve.txt index 45d215fa4ad..7a62bee62ae 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.lazyResolve.txt @@ -340,15 +340,15 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts } public? final? data [ResolvedTo(TYPES)] class MyDataClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|one/two/MyDataClass| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|>): R|one/two/MyDataClass| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/prop1| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = R|/prop1| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/prop2| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> = R|/prop2| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] get(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass| { @@ -367,9 +367,9 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts } - public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|one/two/Anno|[Unresolved](IntegerLiteral(3).plus#(constant#)) MyClass|> public final [ResolvedTo(TYPES)] fun copy([ResolvedTo(TYPES)] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(TYPES)] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| @@ -655,15 +655,15 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts } public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = R|/prop1| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop1| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = R|/prop2| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop2| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass| { @@ -682,9 +682,9 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts } - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| @@ -718,15 +718,15 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts } public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop1] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop2] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } - public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = R|/prop1| - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop1| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| = R|/prop2| - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = R|/prop2| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass| { @@ -745,9 +745,9 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts } - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(IntegerLiteral(3).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| public final [ResolvedTo(BODY_RESOLVE)] fun copy([ResolvedTo(BODY_RESOLVE)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(BODY_RESOLVE)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass| diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.after.txt index dc97c512bb9..f54ff5ead76 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.after.txt @@ -32,6 +32,6 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentN.kt public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|((String(parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.before.txt index 12838a992e2..e649d1123c9 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.before.txt @@ -32,6 +32,6 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentN.kt public? final operator [ResolvedTo(TYPES)] fun component1(): R|@R|properties/Anno|((String(parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>>| - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] property: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] property: @R|properties/Anno|[Unresolved]((String(parameter type: ), constant#)) List(String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>|> = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.lazyResolve.txt index 654f899d1df..f6945931908 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.lazyResolve.txt @@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentN.kt public? final operator [ResolvedTo(TYPES)] fun component1(): R|@R|properties/Anno|((String(parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>>| - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] property: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] property: @R|properties/Anno|[Unresolved]((String(parameter type: ), constant#)) List(String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>|> = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| } @@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentN.kt public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|((String(parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| } @@ -318,7 +318,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentN.kt public final operator [ResolvedTo(BODY_RESOLVE)] fun component1(): R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|((String(parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.after.txt index 93dc79a41fa..338cc464c14 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.after.txt @@ -38,7 +38,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentNScript.kts public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|((String(parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.before.txt index d207f9872f3..7f3636b18dd 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.before.txt @@ -38,7 +38,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentNScript.kts public? final operator [ResolvedTo(TYPES)] fun component1(): R|@R|properties/Anno|((String(parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>>| - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] property: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] property: @R|properties/Anno|[Unresolved]((String(parameter type: ), constant#)) List(String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>|> = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.lazyResolve.txt index df2974f9115..b218b7811d9 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.lazyResolve.txt @@ -197,7 +197,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentNScript.kts public? final operator [ResolvedTo(TYPES)] fun component1(): R|@R|properties/Anno|((String(parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>>| - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] property: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] property: @R|properties/Anno|[Unresolved]((String(parameter type: ), constant#)) List(String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>|> = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| } @@ -367,7 +367,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentNScript.kts public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|((String(parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| } @@ -401,7 +401,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentNScript.kts public final operator [ResolvedTo(BODY_RESOLVE)] fun component1(): R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|((String(parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter type: ), constant#)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|(position = (String(parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.after.txt index e2db74f9850..c808631246e 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.after.txt @@ -35,19 +35,19 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopy.kt public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val constant: R|kotlin/Int| = Int(0) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public final data [ResolvedTo(STATUS)] class MyClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>|): R|properties/MyClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>|): R|properties/MyClass| { LAZY_super } - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| = R|/property1| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = R|/property1| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| = R|/property2| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = R|/property2| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass| diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.before.txt index 3e6678e38b5..2cf46ef17aa 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.before.txt @@ -35,19 +35,19 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopy.kt public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): public? final? data [ResolvedTo(TYPES)] class MyClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property1] property1: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property2] property2: @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>>): R|properties/MyClass| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property1] property1: @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property2] property2: @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|>): R|properties/MyClass| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/property1| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> = R|/property1| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> = R|/property2| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> = R|/property2| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> - public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> - public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> + public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> public final [ResolvedTo(TYPES)] fun copy([ResolvedTo(TYPES)] property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(TYPES)] property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass| diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.lazyResolve.txt index dce0807c93a..b6b9d3f1fd7 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.lazyResolve.txt @@ -172,19 +172,19 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopy.kt public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): public? final? data [ResolvedTo(TYPES)] class MyClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property1] property1: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property2] property2: @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>>): R|properties/MyClass| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property1] property1: @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property2] property2: @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|>): R|properties/MyClass| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/property1| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> = R|/property1| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> = R|/property2| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> = R|/property2| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> - public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> - public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> + public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> public final [ResolvedTo(TYPES)] fun copy([ResolvedTo(TYPES)] property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(TYPES)] property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass| @@ -332,19 +332,19 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopy.kt public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val constant: R|kotlin/Int| = Int(0) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public final data [ResolvedTo(STATUS)] class MyClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>|): R|properties/MyClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>|): R|properties/MyClass| { LAZY_super } - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| = R|/property1| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = R|/property1| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| = R|/property2| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = R|/property2| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass| @@ -364,19 +364,19 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopy.kt public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val constant: R|kotlin/Int| = Int(0) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public final data [ResolvedTo(STATUS)] class MyClass : R|kotlin/Any| { - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>|): R|properties/MyClass| { + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>|): R|properties/MyClass| { LAZY_super } - public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| = R|/property1| - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = R|/property1| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| = R|/property2| - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = R|/property2| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| public final [ResolvedTo(BODY_RESOLVE)] fun copy([ResolvedTo(BODY_RESOLVE)] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(BODY_RESOLVE)] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass| diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.after.txt index 19b8faef0b7..f230a74a7e0 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.after.txt @@ -41,20 +41,21 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopyScript.kts public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public final data [ResolvedTo(STATUS)] class MyClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>|): R|properties/MyClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>|): R|properties/MyClass| { LAZY_super } - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| = R|/property1| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = R|/property1| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| = R|/property2| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = R|/property2| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass| } + diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.before.txt index 5fab563883e..65eb557477f 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.before.txt @@ -41,20 +41,21 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopyScript.kts public? [ResolvedTo(RAW_FIR)] get(): public? final? data [ResolvedTo(TYPES)] class MyClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property1] property1: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property2] property2: @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>>): R|properties/MyClass| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property1] property1: @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property2] property2: @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|>): R|properties/MyClass| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/property1| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> = R|/property1| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> = R|/property2| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> = R|/property2| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> - public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> - public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> + public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> public final [ResolvedTo(TYPES)] fun copy([ResolvedTo(TYPES)] property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(TYPES)] property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass| } + diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.lazyResolve.txt index d9563409b49..b35df13ea2e 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.lazyResolve.txt @@ -213,19 +213,19 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopyScript.kts public? [ResolvedTo(RAW_FIR)] get(): public? final? data [ResolvedTo(TYPES)] class MyClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property1] property1: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property2] property2: @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>>): R|properties/MyClass| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property1] property1: @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=properties/MyClass.property2] property2: @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|>): R|properties/MyClass| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = R|/property1| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> = R|/property1| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> - public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> = R|/property2| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> + public? final? [ResolvedTo(RAW_FIR)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> = R|/property2| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> - public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> + public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|properties/Anno|[Unresolved]((String(parameter1 type: ), constant#)) List(String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>|> - public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) Collection<@Anno[Unresolved](LAZY_EXPRESSION) String>> + public? final operator [ResolvedTo(RAW_FIR)] fun component2(): @R|properties/Anno|[Unresolved]((String(parameter2 type: ), constant#)) Collection(String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>|> public final [ResolvedTo(TYPES)] fun copy([ResolvedTo(TYPES)] property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(TYPES)] property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass| @@ -408,19 +408,19 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopyScript.kts public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public final data [ResolvedTo(STATUS)] class MyClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>|): R|properties/MyClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>|, [ResolvedTo(STATUS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>|): R|properties/MyClass| { LAZY_super } - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| = R|/property1| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = R|/property1| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| = R|/property2| - public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = R|/property2| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass| @@ -447,19 +447,19 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopyScript.kts public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public final data [ResolvedTo(STATUS)] class MyClass : R|kotlin/Any| { - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>|): R|properties/MyClass| { + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=properties/MyClass.property1] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=properties/MyClass.property2] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>|): R|properties/MyClass| { LAZY_super } - public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| = R|/property1| - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = R|/property1| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| = R|/property2| - public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = R|/property2| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| - public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|((String(parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested parameter1 type: ), constant#)) kotlin/collections/List<@R|properties/Anno|((String(nested nested parameter1 type: ), constant#)) kotlin/Int>>| + public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| - public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|((String(parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested parameter2 type: ), constant#)) kotlin/collections/Collection<@R|properties/Anno|((String(nested nested parameter2 type: ), constant#)) kotlin/String>>| + public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| public final [ResolvedTo(BODY_RESOLVE)] fun copy([ResolvedTo(BODY_RESOLVE)] property1: R|@R|properties/Anno|(position = (String(parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested parameter1 type: ), R|properties/constant|)) kotlin/collections/List<@R|properties/Anno|(position = (String(nested nested parameter1 type: ), R|properties/constant|)) kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(BODY_RESOLVE)] property2: R|@R|properties/Anno|(position = (String(parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested parameter2 type: ), R|properties/constant|)) kotlin/collections/Collection<@R|properties/Anno|(position = (String(nested nested parameter2 type: ), R|properties/constant|)) kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass| diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.after.txt index f434695f3de..c4eb00db29f 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.after.txt @@ -79,6 +79,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotations.kt public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.before.txt index e226b90d39e..b7edf2da554 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.before.txt @@ -79,6 +79,6 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotations.kt public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.lazyResolve.txt index 1b37fdad3ea..06267c8eb4d 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.lazyResolve.txt @@ -294,7 +294,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotations.kt public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } @@ -544,7 +544,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotations.kt public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } @@ -594,7 +594,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotations.kt public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.after.txt index 95fe5bd87ac..1b610f851d1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.after.txt @@ -86,7 +86,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotationsScript.kts public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.before.txt index cde85a85b32..633f0c18d10 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.before.txt @@ -86,7 +86,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotationsScript.kts public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.lazyResolve.txt index 55b326fdf7d..8a71811c8bd 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.lazyResolve.txt @@ -341,7 +341,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotationsScript.kts public? final operator [ResolvedTo(RAW_FIR)] fun component1(): @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> - public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(RAW_FIR)] fun copy([ResolvedTo(RAW_FIR)] prop: @R|one/two/Anno|[Unresolved](IntegerLiteral(0).plus#(constant#)) MyClass|> = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } @@ -631,7 +631,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotationsScript.kts public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } @@ -689,7 +689,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotationsScript.kts public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| - public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| + public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt index 041093ab5be..49693f26788 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt @@ -1494,25 +1494,7 @@ open class PsiRawFirBuilder( context.className, createClassTypeRefWithSourceKind = { firPrimaryConstructor.returnTypeRef.copyWithNewSourceKind(it) }, createParameterTypeRefWithSourceKind = { property, newKind -> - // just making a shallow copy isn't enough type ref may be a function type ref - // and contain value parameters inside - - val returnTypeRef = property.returnTypeRef - - when (returnTypeRef) { - is FirErrorTypeRef -> { - buildErrorTypeRefCopy(returnTypeRef) { - source = returnTypeRef.source?.fakeElement(newKind) - } - } - else -> { - withDefaultSourceElementKind(newKind) { - (returnTypeRef.psi as KtTypeReference?).toFirOrImplicitType() - } - } - } - - + property.returnTypeRef.copyWithNewSourceKind(newKind) }, addValueParameterAnnotations = { addAnnotationsFrom(it as KtParameter, isFromPrimaryConstructor = true) }, ).generate()