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

[FIR] Don't transform property initializers in type resolve

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-07-14 13:19:08 +03:00
parent 9e94189852
commit 1b78950ebb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt
+8 -3
View File
@@ -90,13 +90,18 @@ class FirTypeResolveTransformer(
override fun transformProperty(property: FirProperty, data: Nothing?): CompositeTransformResult<FirDeclaration> { override fun transformProperty(property: FirProperty, data: Nothing?): CompositeTransformResult<FirDeclaration> {
return withScopeCleanup { return withScopeCleanup {
property.addTypeParametersScope() property.addTypeParametersScope()
val result = transformDeclaration(property, data).single as FirProperty property.replaceResolvePhase(FirResolvePhase.TYPES)
property.transformTypeParameters(this, data)
.transformReturnTypeRef(this, data)
.transformReceiverTypeRef(this, data)
.transformGetter(this, data)
.transformSetter(this, data)
if (property.isFromVararg == true) { if (property.isFromVararg == true) {
result.transformTypeToArrayType() property.transformTypeToArrayType()
property.getter?.transformReturnTypeRef(StoreType, property.returnTypeRef) property.getter?.transformReturnTypeRef(StoreType, property.returnTypeRef)
property.setter?.valueParameters?.map { it.transformReturnTypeRef(StoreType, property.returnTypeRef) } property.setter?.valueParameters?.map { it.transformReturnTypeRef(StoreType, property.returnTypeRef) }
} }
result.compose() property.compose()
} }
} }