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

[LL FIR] fix scope for constructor resolution

Browse Source 
We should grab static scope before in the same way as scopesBefore
to not get already updated static scope with nested scopes.
Also, we should restore such "before" snapshots to avoid their modification
(this can be reproduced with in the next commit)

^KT-63042
This commit is contained in:
Dmitrii Gridin
2023-11-16 18:28:27 +01:00
committed by Space Team
parent a9aa0e020a
commit ab6b3a6047
34 changed files with 259 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClash.txt
Vendored
+4 -4
View File
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt
}
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base|>()
super<R|second/Base|>()
}
public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
LAZY_super<R|kotlin/Any|>
}
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClash.kt
}
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base|>()
super<R|second/Base|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashImplicitConstructor.txt
Vendored
+4 -4
View File
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt
}
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base|>()
super<R|second/Base|>()
}
public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
LAZY_super<R|kotlin/Any|>
}
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashImplicitConstructor.kt
}
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base|>()
super<R|second/Base|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashImplicitConstructorScript.txt
Vendored
+5 -4
View File
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base|>()
super<R|second/Base|>()
}
public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
LAZY_super<R|kotlin/Any|>
}
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashImplicitConstructorScript
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base|>()
super<R|second/Base|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashImplicitConstructorScript
}
}
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashScript.txt
Vendored
+5 -4
View File
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base|>()
super<R|second/Base|>()
}
public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
LAZY_super<R|kotlin/Any|>
}
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashScript.kts
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base|>()
super<R|second/Base|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashScript.kts
}
}
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotation.txt
Vendored
+4 -4
View File
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base|>()
}
public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
LAZY_super<R|kotlin/Any|>
}
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotation.kt
public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationImplicitConstructor.txt
Vendored
+4 -4
View File
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base|>()
}
public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
LAZY_super<R|kotlin/Any|>
}
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationImplicitCon
public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationImplicitConstructorScript.txt
Vendored
+5 -4
View File
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base|>()
}
public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
LAZY_super<R|kotlin/Any|>
}
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationImplicitCon
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationImplicitCon
}
}
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationScript.txt
Vendored
+5 -4
View File
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base|>()
}
public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
LAZY_super<R|kotlin/Any|>
}
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationScript.kts
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationScript.kts
}
}
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClash.txt
Vendored
+4 -4
View File
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt
}
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
super<R|second/Base<second/Base<kotlin/Int>>|>()
}
public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClash.kt
}
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
super<R|second/Base<second/Base<kotlin/Int>>|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashImplicitConstructor.txt
Vendored
+4 -4
View File
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt
}
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
super<R|second/Base<second/Base<kotlin/Int>>|>()
}
public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashImplicitConstructor
}
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
super<R|second/Base<second/Base<kotlin/Int>>|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashImplicitConstructorScript.txt
Vendored
+5 -4
View File
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
super<R|second/Base<second/Base<kotlin/Int>>|>()
}
public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashImplicitConstructor
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
super<R|second/Base<second/Base<kotlin/Int>>|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashImplicitConstructor
}
}
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashScript.txt
Vendored
+5 -4
View File
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
super<R|second/Base<second/Base<kotlin/Int>>|>()
}
public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashScript.kts
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
super<R|second/Base<second/Base<kotlin/Int>>|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashScript.kts
}
}
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotation.txt
Vendored
+4 -4
View File
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotation.kt
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
}
public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotation.kt
public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.txt
Vendored
+4 -4
View File
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
}
public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationImpli
public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.txt
Vendored
+5 -4
View File
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
}
public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationImpli
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationImpli
}
}
analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationScript.txt
Vendored
+5 -4
View File
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationScript.kts
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
}
public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
LAZY_super<R|kotlin/Any|>
}
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationScrip
public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|>()
}
public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationScrip
}
}