From ca6c6ae0f3e54fa8fc4e232334da4fc7aa8b6931 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Wed, 24 Aug 2016 12:51:34 +0300
Subject: [PATCH] Refactoring. Move creation of functionProcessor into
 resolution module.

---
 .../calls/tower/NewResolutionOldInference.kt  | 38 ++-----------------
 .../calls/tower/ScopeTowerProcessors.kt       | 35 ++++++++++++++++-
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt
index 3232a78b700..5b73724d455 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt
@@ -73,7 +73,7 @@ class NewResolutionOldInference(
                     scopeTower: ScopeTower, explicitReceiver: Receiver?, context: BasicCallResolutionContext
             ): ScopeTowerProcessor<MyCandidate<FunctionDescriptor>> {
                 val functionContext = outer.SimpleContext<FunctionDescriptor>(scopeTower, name, context, tracing)
-                return outer.createFunctionTowerProcessor(functionContext, explicitReceiver)
+                return createFunctionProcessor(functionContext, outer.InvokeContext(functionContext), explicitReceiver)
             }
         }
 
@@ -95,7 +95,7 @@ class NewResolutionOldInference(
                 val simpleContextF = outer.SimpleContext<FunctionDescriptor>(scopeTower, name, context, tracing)
                 val simpleContextV = outer.SimpleContext<VariableDescriptor>(scopeTower, name, context, tracing)
                 return CompositeScopeTowerProcessor(
-                        createFunctionProcessor(simpleContextF, explicitReceiver, classValueReceiver = false),
+                        createSimpleFunctionProcessor(simpleContextF, explicitReceiver, classValueReceiver = false),
                         createVariableProcessor(simpleContextV, explicitReceiver, classValueReceiver = false)
                 )
             }
@@ -111,7 +111,7 @@ class NewResolutionOldInference(
                 val call = (context.call as? CallTransformer.CallForImplicitInvoke).sure {
                     "Call should be CallForImplicitInvoke, but it is: ${context.call}"
                 }
-                return outer.createProcessorWithReceiverValueOrEmpty(explicitReceiver) {
+                return createProcessorWithReceiverValueOrEmpty(explicitReceiver) {
                     createCallTowerProcessorForExplicitInvoke(functionContext, call.dispatchReceiver, it)
                 }
             }
@@ -189,38 +189,6 @@ class NewResolutionOldInference(
         this.allCandidates = allCandidates.map { it.resolvedCall }
     }
 
-    private fun <D : CallableDescriptor> createProcessorWithReceiverValueOrEmpty(
-            explicitReceiver: Receiver?,
-            create: (ReceiverValue?) -> ScopeTowerProcessor<MyCandidate<D>>
-    ): ScopeTowerProcessor<MyCandidate<D>> {
-        return if (explicitReceiver is QualifierReceiver) {
-            (explicitReceiver as? ClassQualifier)?.classValueReceiver?.let(create)
-            ?: KnownResultProcessor<MyCandidate<D>>(listOf())
-        }
-        else {
-            create(explicitReceiver as ReceiverValue?)
-        }
-    }
-
-    private fun createFunctionTowerProcessor(
-            simpleContext: SimpleContext<FunctionDescriptor>,
-            explicitReceiver: Receiver?
-    ): CompositeScopeTowerProcessor<MyCandidate<FunctionDescriptor>> {
-        val invokeContext = InvokeContext(simpleContext)
-
-        // a.foo() -- simple function call
-        val simpleFunction = createFunctionProcessor(simpleContext, explicitReceiver)
-
-        // a.foo() -- property a.foo + foo.invoke()
-        val invokeProcessor = InvokeTowerProcessor(invokeContext, explicitReceiver)
-
-        // a.foo() -- property foo is extension function with receiver a -- a.invoke()
-        val invokeExtensionProcessor = createProcessorWithReceiverValueOrEmpty(explicitReceiver) { InvokeExtensionTowerProcessor(invokeContext, it) }
-
-        return CompositeScopeTowerProcessor(simpleFunction, invokeProcessor, invokeExtensionProcessor)
-    }
-
-
     private fun <D : CallableDescriptor> convertToOverloadResults(
             candidates: Collection<MyCandidate<D>>,
             tracing: TracingStrategy,
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTowerProcessors.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTowerProcessors.kt
index 5cf3c669fcb..dddbfdd6a27 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTowerProcessors.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTowerProcessors.kt
@@ -165,6 +165,39 @@ fun <C : Candidate<VariableDescriptor>> createVariableAndObjectProcessor(
         createSimpleProcessor(context, explicitReceiver, classValueReceiver, ScopeTowerLevel::getObjects)
 )
 
-fun <C : Candidate<FunctionDescriptor>> createFunctionProcessor(
+fun <C : Candidate<FunctionDescriptor>> createSimpleFunctionProcessor(
         context: TowerContext<FunctionDescriptor, C>, explicitReceiver: Receiver?, classValueReceiver: Boolean = true
 ) = createSimpleProcessor(context, explicitReceiver, classValueReceiver, ScopeTowerLevel::getFunctions)
+
+
+fun <F: Candidate<FunctionDescriptor>, V: Candidate<VariableDescriptor>> createFunctionProcessor(
+        simpleContext: TowerContext<FunctionDescriptor, F>,
+        invokeContext: InvokeTowerContext<F, V>,
+        explicitReceiver: Receiver?
+): CompositeScopeTowerProcessor<F> {
+
+    // a.foo() -- simple function call
+    val simpleFunction = createSimpleFunctionProcessor(simpleContext, explicitReceiver)
+
+    // a.foo() -- property a.foo + foo.invoke()
+    val invokeProcessor = InvokeTowerProcessor(invokeContext, explicitReceiver)
+
+    // a.foo() -- property foo is extension function with receiver a -- a.invoke()
+    val invokeExtensionProcessor = createProcessorWithReceiverValueOrEmpty(explicitReceiver) { InvokeExtensionTowerProcessor(invokeContext, it) }
+
+    return CompositeScopeTowerProcessor(simpleFunction, invokeProcessor, invokeExtensionProcessor)
+}
+
+
+fun <D : CallableDescriptor, C: Candidate<D>> createProcessorWithReceiverValueOrEmpty(
+        explicitReceiver: Receiver?,
+        create: (ReceiverValue?) -> ScopeTowerProcessor<C>
+): ScopeTowerProcessor<C> {
+    return if (explicitReceiver is QualifierReceiver) {
+        explicitReceiver.classValueReceiver?.let(create)
+        ?: KnownResultProcessor<C>(listOf())
+    }
+    else {
+        create(explicitReceiver as ReceiverValue?)
+    }
+}
\ No newline at end of file