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

[LL FIR] resolve constructor parameter before generated property

Browse Source 
This is required to have stable resolution order to avoid concurrent
modifications

^KT-63042
This commit is contained in:
Dmitrii Gridin
2023-11-20 17:55:01 +01:00
committed by Space Team
parent 6ecaccbcfe
commit 5fa516e010
28 changed files with 231 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollision.txt
Vendored
+1 -1
View File
@@ -326,7 +326,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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|>
}
analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollisionScript.txt
Vendored
+2 -1
View File
@@ -397,7 +397,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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|>
}
@@ -451,3 +451,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] copyTypeCollisionScript.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
+9 -9
View File
@@ -65,7 +65,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
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|>
}
@@ -94,7 +94,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
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|>
}
@@ -123,7 +123,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
public? final? data [ResolvedTo(SUPER_TYPES)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(SUPER_TYPES)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -152,7 +152,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.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.prop] prop: MyClass): R|one/two/MyDataClass| {
public? [ResolvedTo(TYPES)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(TYPES)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -210,7 +210,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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|>
}
@@ -239,7 +239,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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|>
}
@@ -268,7 +268,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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|>
}
@@ -297,7 +297,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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|>
}
@@ -326,7 +326,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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
+10 -9
View File
@@ -82,7 +82,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
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|>
}
@@ -117,7 +117,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
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|>
}
@@ -152,7 +152,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public? final? data [ResolvedTo(SUPER_TYPES)] class MyDataClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(SUPER_TYPES)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -187,7 +187,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.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.prop] prop: MyClass): R|one/two/MyDataClass| {
public? [ResolvedTo(TYPES)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(TYPES)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
LAZY_super<R|kotlin/Any|>
}
@@ -257,7 +257,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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|>
}
@@ -292,7 +292,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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|>
}
@@ -327,7 +327,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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|>
}
@@ -362,7 +362,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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|>
}
@@ -397,7 +397,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts
}
public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| {
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|>
}
@@ -451,3 +451,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] propertyTypeCollisionScript.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|
}