From 4ba92f66c0f4a679e49702b9d3c144f79aac77fe Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 15 Dec 2022 13:24:16 +0200
Subject: [PATCH] [FIR] Get rid of `TransformImplicitType` transformer

---
 .../fir/resolve/transformers/TransformUtils.kt      | 13 -------------
 .../body/resolve/FirImplicitBodyResolve.kt          |  5 +----
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt
index 3c57fed69e3..f62253e17ea 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt
@@ -28,19 +28,6 @@ internal object StoreType : FirDefaultTransformer<FirTypeRef>() {
     }
 }
 
-internal object TransformImplicitType : FirDefaultTransformer<FirTypeRef>() {
-    override fun <E : FirElement> transformElement(element: E, data: FirTypeRef): E {
-        return element
-    }
-
-    override fun transformImplicitTypeRef(
-        implicitTypeRef: FirImplicitTypeRef,
-        data: FirTypeRef
-    ): FirTypeRef {
-        return data
-    }
-}
-
 internal fun FirValueParameter.transformVarargTypeToArrayType() {
     if (isVararg) {
         this.transformTypeToArrayType()
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt
index 6d24056ba9f..77ee05d0d0a 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.fir.resolve.providers.firProvider
 import org.jetbrains.kotlin.fir.resolve.transformers.AdapterForResolveProcessor
 import org.jetbrains.kotlin.fir.resolve.transformers.FirTransformerBasedResolveProcessor
 import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculator
-import org.jetbrains.kotlin.fir.resolve.transformers.TransformImplicitType
 import org.jetbrains.kotlin.fir.resolve.transformers.contracts.runContractResolveForLocalClass
 import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
 import org.jetbrains.kotlin.fir.scopes.fakeOverrideSubstitution
@@ -219,9 +218,7 @@ private class ReturnTypeCalculatorWithJump(
 
     override fun tryCalculateReturnTypeOrNull(declaration: FirCallableDeclaration): FirResolvedTypeRef {
         if (declaration is FirValueParameter && declaration.returnTypeRef is FirImplicitTypeRef) {
-            // TODO?
-            declaration.transformReturnTypeRef(
-                TransformImplicitType,
+            declaration.replaceReturnTypeRef(
                 buildErrorTypeRef {
                     diagnostic = ConeSimpleDiagnostic("Unsupported: implicit VP type")
                 }