From 02a57aab7d8ed99af16583f9295b7b8718fdfb64 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 10 Jan 2020 13:18:27 +0300
Subject: [PATCH] [FIR] Code refactoring: InvokeReceiverCandidateCollector

---
 .../kotlin/fir/resolve/calls/Candidate.kt     |  6 +++
 .../fir/resolve/calls/CandidateCollector.kt   | 51 +++++++++----------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt
index 94993e6e63b..77181343bb8 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt
@@ -43,6 +43,12 @@ class CallInfo(
 ) {
     val argumentCount get() = arguments.size
 
+    fun replaceExplicitReceiver(explicitReceiver: FirExpression): CallInfo =
+        CallInfo(
+            callKind, explicitReceiver, arguments,
+            isSafeCall, typeArguments, session, containingFile, implicitReceiverStack, expectedType, outerCSBuilder, lhs
+        )
+
     fun withReceiverAsArgument(receiverExpression: FirExpression): CallInfo =
         CallInfo(
             callKind, explicitReceiver,
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateCollector.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateCollector.kt
index 5b4832d71c6..172ad76ee0c 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateCollector.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateCollector.kt
@@ -80,52 +80,47 @@ class InvokeReceiverCandidateCollector(
     private val invokeConsumer: AccumulatingTowerDataConsumer,
     resolutionStageRunner: ResolutionStageRunner
 ) : CandidateCollector(components, resolutionStageRunner) {
+    private fun createBoundInvokeConsumer(boundInvokeCallInfo: CallInfo): TowerDataConsumer {
+        return createSimpleFunctionConsumer(
+            components.session, OperatorNameConventions.INVOKE,
+            boundInvokeCallInfo, components, towerResolver.collector
+        )
+    }
+
+    private fun createExplicitReceiverForInvoke(candidate: Candidate): FirQualifiedAccessExpressionImpl {
+        val symbol = candidate.symbol as FirCallableSymbol<*>
+        return FirQualifiedAccessExpressionImpl(null).apply {
+            calleeReference = FirNamedReferenceWithCandidate(
+                null,
+                symbol.callableId.callableName,
+                candidate
+            )
+            dispatchReceiver = candidate.dispatchReceiverExpression()
+            typeRef = towerResolver.typeCalculator.tryCalculateReturnType(symbol.firUnsafe())
+        }
+    }
+
     override fun consumeCandidate(group: Int, candidate: Candidate): CandidateApplicability {
         val applicability = super.consumeCandidate(group, candidate)
 
         if (applicability >= CandidateApplicability.SYNTHETIC_RESOLVED) {
-            val session = components.session
             val symbol = candidate.symbol as FirCallableSymbol<*>
             val extensionReceiverExpression = candidate.extensionReceiverExpression()
             val useExtensionReceiverAsArgument =
                 symbol.fir.receiverTypeRef == null &&
                         candidate.explicitReceiverKind == ExplicitReceiverKind.EXTENSION_RECEIVER &&
                         symbol.fir.returnTypeRef.isExtensionFunctionType()
-            val explicitReceiver = FirQualifiedAccessExpressionImpl(null).apply {
-                calleeReference = FirNamedReferenceWithCandidate(
-                    null,
-                    symbol.callableId.callableName,
-                    candidate
-                )
-                dispatchReceiver = candidate.dispatchReceiverExpression()
+            val explicitReceiver = createExplicitReceiverForInvoke(candidate).apply {
                 extensionReceiver = extensionReceiverExpression.takeIf { !useExtensionReceiverAsArgument } ?: FirNoReceiverExpression
-                typeRef = towerResolver.typeCalculator.tryCalculateReturnType(candidate.symbol.firUnsafe())
             }.let {
                 components.transformQualifiedAccessUsingSmartcastInfo(it)
             }
-            val boundInvokeCallInfo = CallInfo(
-                invokeCallInfo.callKind,
-                explicitReceiver,
-                invokeCallInfo.arguments,
-                invokeCallInfo.isSafeCall,
-                invokeCallInfo.typeArguments,
-                session,
-                invokeCallInfo.containingFile,
-                invokeCallInfo.implicitReceiverStack,
-                invokeCallInfo.expectedType,
-                invokeCallInfo.outerCSBuilder,
-                invokeCallInfo.lhs
-            ).let {
+            val boundInvokeCallInfo = invokeCallInfo.replaceExplicitReceiver(explicitReceiver).let {
                 if (useExtensionReceiverAsArgument) it.withReceiverAsArgument(extensionReceiverExpression)
                 else it
             }
 
-            invokeConsumer.addConsumerAndProcessAccumulatedData(
-                createSimpleFunctionConsumer(
-                    session, OperatorNameConventions.INVOKE,
-                    boundInvokeCallInfo, towerResolver.components, towerResolver.collector
-                )
-            )
+            invokeConsumer.addConsumerAndProcessAccumulatedData(createBoundInvokeConsumer(boundInvokeCallInfo))
         }
 
         return applicability