From 329af659967d207986fd4eb644af8622499e42a7 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Tue, 19 May 2020 11:36:31 +0300
Subject: [PATCH] [FIR] Get rid of `FirStatusResolveTransformerAdapter`

---
 .../transformers/FirStatusResolveTransformer.kt   | 15 +--------------
 .../fir/resolve/transformers/ResolvePhaseUtils.kt |  2 +-
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt
index d31cbd9a6d8..e663dd0671b 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt
@@ -17,29 +17,16 @@ import org.jetbrains.kotlin.fir.expressions.FirStatement
 import org.jetbrains.kotlin.fir.extensions.extensionsService
 import org.jetbrains.kotlin.fir.extensions.statusTransformerExtensions
 import org.jetbrains.kotlin.fir.visitors.CompositeTransformResult
-import org.jetbrains.kotlin.fir.visitors.FirTransformer
 import org.jetbrains.kotlin.fir.visitors.compose
 import org.jetbrains.kotlin.fir.visitors.transformSingle
 
-@AdapterForResolvePhase
-class FirStatusResolveTransformerAdapter : FirTransformer<Nothing?>() {
-    override fun <E : FirElement> transformElement(element: E, data: Nothing?): CompositeTransformResult<E> {
-        error("Should not be called for ${element::class}, only for files")
-    }
-
-    override fun transformFile(file: FirFile, data: Nothing?): CompositeTransformResult<FirDeclaration> {
-        val transformer = FirStatusResolveTransformer(file.session)
-        return file.transform(transformer, null)
-    }
-}
-
 fun <F : FirClass<F>> F.runStatusResolveForLocalClass(session: FirSession): F {
     val transformer = FirStatusResolveTransformer(session)
 
     return this.transform<F, Nothing?>(transformer, null).single
 }
 
-private class FirStatusResolveTransformer(
+class FirStatusResolveTransformer(
     override val session: FirSession
 ) : FirAbstractTreeTransformer<FirDeclarationStatus?>(phase = FirResolvePhase.STATUS) {
     private val classes = mutableListOf<FirClass<*>>()
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/ResolvePhaseUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/ResolvePhaseUtils.kt
index 734e2ee1153..1c5c5b5b3d3 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/ResolvePhaseUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/ResolvePhaseUtils.kt
@@ -27,7 +27,7 @@ fun FirResolvePhase.createTransformerByPhase(session: FirSession, scopeSession:
         SUPER_TYPES -> FirSupertypeResolverTransformer(session, scopeSession)
         SEALED_CLASS_INHERITORS -> FirSealedClassInheritorsTransformer()
         TYPES -> FirTypeResolveTransformer(session, scopeSession)
-        STATUS -> FirStatusResolveTransformerAdapter()
+        STATUS -> FirStatusResolveTransformer(session)
         CONTRACTS -> FirContractResolveTransformerAdapter(scopeSession)
         IMPLICIT_TYPES_BODY_RESOLVE -> FirImplicitTypeBodyResolveTransformerAdapter(scopeSession)
         BODY_RESOLVE -> FirBodyResolveTransformerAdapter(scopeSession)