From 5bb61d2d02c7b17c828f8e05e989e2bfe31ea614 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Wed, 24 May 2017 14:58:53 +0300
Subject: [PATCH] [NI] Small improvements in callable reference resolution.

I'm not sure in this commit, but it fix some test -> let it be for now.
And yes, now I do not know correct way for callable reference resolution,
so for now it is just proposals.
---
 .../kotlin/resolve/calls/components/KotlinCallCompleter.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt
index 5a1ecf7b8ca..458baf1ba2e 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt
@@ -78,14 +78,19 @@ class KotlinCallCompleter(
                     is VariableAsFunctionKotlinResolutionCandidate -> candidate.invokeCandidate
                     else -> candidate as SimpleKotlinResolutionCandidate
                 }
-        resolveCallableReferenceArguments(topLevelCall)
 
         if (topLevelCall.prepareForCompletion(expectedType)) {
+            resolveCallableReferenceArguments(topLevelCall)
+
             val c = candidate.lastCall.constraintSystem.asCallCompleterContext()
 
             topLevelCall.competeCall(c, resolutionCallbacks)
             return toCompletedBaseResolvedCall(c, candidate, resolutionCallbacks)
         }
+        else {
+            // todo I'm not sure that we should do this
+            resolveCallableReferenceArguments(topLevelCall)
+        }
 
         return ResolvedKotlinCall.OnlyResolvedKotlinCall(candidate)
     }