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

[NI] Propagate information about safe call to receiver argument

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-06-06 18:02:21 +03:00
parent 72d14bfe0d
commit 8670d2abba
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/KotlinCallResolver.kt
+3 -1
View File
@@ -66,11 +66,13 @@ class KotlinCallResolver(
): Collection<ResolvedKotlinCall> { ): Collection<ResolvedKotlinCall> {
kotlinCall.checkCallInvariants() kotlinCall.checkCallInvariants()
val isSafeCall = (kotlinCall.explicitReceiver as? SimpleKotlinCallArgument)?.isSafeCall ?: false
val resolutionCandidates = givenCandidates.map { val resolutionCandidates = givenCandidates.map {
SimpleKotlinResolutionCandidate(callContext, SimpleKotlinResolutionCandidate(callContext,
kotlinCall, kotlinCall,
if (it.dispatchReceiver == null) ExplicitReceiverKind.NO_EXPLICIT_RECEIVER else ExplicitReceiverKind.DISPATCH_RECEIVER, if (it.dispatchReceiver == null) ExplicitReceiverKind.NO_EXPLICIT_RECEIVER else ExplicitReceiverKind.DISPATCH_RECEIVER,
it.dispatchReceiver?.let { ReceiverExpressionKotlinCallArgument(it) }, it.dispatchReceiver?.let { ReceiverExpressionKotlinCallArgument(it, isSafeCall) },
null, null,
it.descriptor, it.descriptor,
it.knownTypeParametersResultingSubstitutor, it.knownTypeParametersResultingSubstitutor,