azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[NI] Small improvements in callable reference resolution.

Browse Source 
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.
This commit is contained in:
Stanislav Erokhin
2017-05-24 14:58:53 +03:00
committed by Mikhail Zarechenskiy
parent 7eabdeffb3
commit 5bb61d2d02
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt
+6 -1
View File
@@ -78,14 +78,19 @@ class KotlinCallCompleter(
is VariableAsFunctionKotlinResolutionCandidate -> candidate.invokeCandidate is VariableAsFunctionKotlinResolutionCandidate -> candidate.invokeCandidate
else -> candidate as SimpleKotlinResolutionCandidate else -> candidate as SimpleKotlinResolutionCandidate
} }
resolveCallableReferenceArguments(topLevelCall)
if (topLevelCall.prepareForCompletion(expectedType)) { if (topLevelCall.prepareForCompletion(expectedType)) {
resolveCallableReferenceArguments(topLevelCall)
val c = candidate.lastCall.constraintSystem.asCallCompleterContext() val c = candidate.lastCall.constraintSystem.asCallCompleterContext()
topLevelCall.competeCall(c, resolutionCallbacks) topLevelCall.competeCall(c, resolutionCallbacks)
return toCompletedBaseResolvedCall(c, candidate, resolutionCallbacks) return toCompletedBaseResolvedCall(c, candidate, resolutionCallbacks)
} }
else {
// todo I'm not sure that we should do this
resolveCallableReferenceArguments(topLevelCall)
}
return ResolvedKotlinCall.OnlyResolvedKotlinCall(candidate) return ResolvedKotlinCall.OnlyResolvedKotlinCall(candidate)
} }