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

[FIR] add missing transformation of type parameters during annotation arguments phase

Browse Source 
^KT-56551
This commit is contained in:
Dmitrii Gridin
2023-10-03 16:17:51 +02:00
committed by Space Team
parent 61063a19b6
commit ddc4fac896
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndAnnotations.txt
Vendored
+4 -4
View File
@@ -235,8 +235,8 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotations.kt
public [ResolvedTo(STATUS)] get(): <implicit>
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
@Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
@R|myPack/Anno|[Types](functionProperty#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#) kotlin/Int|.function([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] @R|myPack/Anno|[Types](parameterProperty#) param: R|@R|myPack/Anno|(valueParameterTypeProperty#) kotlin/Int| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
@@ -262,8 +262,8 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotations.kt
public [ResolvedTo(STATUS)] get(): <implicit>
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
@Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
@R|myPack/Anno|[Types](functionProperty#) public final [ResolvedTo(CONTRACTS)] fun <@R|myPack/Anno|[Types](typeParameterProperty#) [ResolvedTo(CONTRACTS)] T> @RECEIVER:R|myPack/Anno|[Types](receiverProperty#) R|@R|myPack/Anno|(receiverTypeProperty#) kotlin/Int|.function([ResolvedTo(CONTRACTS)] @R|myPack/Anno|[Types](parameterProperty#) param: R|@R|myPack/Anno|(valueParameterTypeProperty#) kotlin/Int| = LAZY_EXPRESSION): <implicit> { LAZY_BLOCK }
analysis/low-level-api-fir/testData/lazyResolve/functionWithImplicitTypeAndAnnotationsScript.txt
Vendored
+4 -4
View File
@@ -349,8 +349,8 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotationsScript.kts
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
@Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
@@ -389,8 +389,8 @@ FILE: [ResolvedTo(IMPORTS)] functionWithImplicitTypeAndAnnotationsScript.kts
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val receiverTypeProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
@Anno[Unresolved](LAZY_EXPRESSION) public? final? const [ResolvedTo(RAW_FIR)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
public? [ResolvedTo(RAW_FIR)] get(): <implicit>
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val typeParameterProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
@R|myPack/Anno|[Types](LAZY_EXPRESSION) public final const [ResolvedTo(STATUS)] val valueParameterTypeProperty: <implicit> = LAZY_EXPRESSION
public [ResolvedTo(STATUS)] get(): <implicit>
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsResolveTransformer.kt
+1
View File
@@ -97,6 +97,7 @@ private class FirDeclarationsResolveTransformerForArgumentAnnotations(
.transformReceiverParameter(transformer, data)
.transformValueParameters(transformer, data)
.transformAnnotations(transformer, data)
.transformTypeParameters(transformer, data)
return simpleFunction
}