azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LL FIR] resolve class before constructor

Browse Source 
This is required to have stable resolution order to avoid concurrent
modifications and correct resolution context.
This also fixes KT-63700 as a super call expands only during body
resolution in the case of secondary constructor

^KT-63042
^KT-63700 Fixed
This commit is contained in:
Dmitrii Gridin
2023-11-22 12:21:47 +01:00
committed by Space Team
parent e3d91741ca
commit 5183019cb8
207 changed files with 2011 additions and 1019 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/component1TypeCollision.txt
Vendored
+7 -7
View File
@@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt
}
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -93,7 +93,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt
}
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -238,7 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -267,7 +267,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -325,7 +325,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/component1TypeCollisionScript.txt
Vendored
+7 -7
View File
@@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -256,7 +256,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -326,7 +326,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -361,7 +361,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -396,7 +396,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollision.txt
Vendored
+7 -7
View File
@@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt
}
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -93,7 +93,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt
}
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -238,7 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -267,7 +267,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -325,7 +325,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollisionScript.txt
Vendored
+7 -7
View File
@@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -256,7 +256,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -326,7 +326,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -361,7 +361,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -396,7 +396,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/parameterTypeCollision.txt
Vendored
+7 -7
View File
@@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt
}
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -93,7 +93,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt
}
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -238,7 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -267,7 +267,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -325,7 +325,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
super<R|kotlin/Any|>()
}
analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/parameterTypeCollisionScript.txt
Vendored
+8 -7
View File
@@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -256,7 +256,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -326,7 +326,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -361,7 +361,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -396,7 +396,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
super<R|kotlin/Any|>()
}
@@ -451,3 +451,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] parameterTypeCollisionScript.kts
public final [ResolvedTo(BODY_RESOLVE)] fun copy([ResolvedTo(BODY_RESOLVE)] prop: R|one/two/MyDataClass.MyClass| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass|
}
analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/propertyTypeCollision.txt
Vendored
+7 -7
View File
@@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -93,7 +93,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -238,7 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -267,7 +267,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -325,7 +325,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/propertyTypeCollisionScript.txt
Vendored
+7 -7
View File
@@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -256,7 +256,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -326,7 +326,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -361,7 +361,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -396,7 +396,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}