From 880eb6da6caa8c51bebd14820d5cb701db9e742c Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 8 Oct 2020 11:22:09 +0300 Subject: [PATCH] Don't transform delegated constructor args in FirTypeResolveTransformer --- .../transformers/FirTypeResolveTransformer.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt index 32e929b97b2..2b868b94683 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.resolve.transformers import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirBlock +import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.scopes.FirScope @@ -163,4 +164,15 @@ class FirTypeResolveTransformer( override fun transformBlock(block: FirBlock, data: Nothing?): CompositeTransformResult { return block.compose() } + + override fun transformDelegatedConstructorCall( + delegatedConstructorCall: FirDelegatedConstructorCall, + data: Nothing? + ): CompositeTransformResult { + delegatedConstructorCall.replaceConstructedTypeRef( + delegatedConstructorCall.constructedTypeRef.transform(this, data).single + ) + delegatedConstructorCall.transformCalleeReference(this, data) + return delegatedConstructorCall.compose() + } }