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

[NI] Fix exception explicit qualified receiver and dispatch receiver

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-08-11 12:17:25 +03:00
committed by Stanislav Erokhin
parent 9f71de5f66
commit f42be4aea2
7 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt
+1 -1
View File
@@ -313,7 +313,7 @@ class PSICallResolver(
val variableCallArgument = createReceiverCallArgument(variable)
val explicitReceiver = kotlinCall.explicitReceiver
val callForInvoke = if (useExplicitReceiver && explicitReceiver is SimpleKotlinCallArgument) {
val callForInvoke = if (useExplicitReceiver && explicitReceiver != null) {
PSIKotlinCallForInvoke(kotlinCall, variable, explicitReceiver, variableCallArgument)
}
else {
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSIKotlinCalls.kt
+12 -4
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy
import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategyForInvoke
import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
import org.jetbrains.kotlin.util.OperatorNameConventions
val KotlinCall.psiKotlinCall: PSIKotlinCall get() {
@@ -80,7 +81,7 @@ class PSIKotlinCallForVariable(
class PSIKotlinCallForInvoke(
val baseCall: PSIKotlinCallImpl,
val variableCall: KotlinResolutionCandidate,
override val explicitReceiver: SimpleKotlinCallArgument,
override val explicitReceiver: ReceiverKotlinCallArgument,
override val dispatchReceiverForInvokeExtension: SimpleKotlinCallArgument?
) : PSIKotlinCall() {
override val callKind: KotlinCallKind get() = KotlinCallKind.FUNCTION
@@ -101,8 +102,15 @@ class PSIKotlinCallForInvoke(
val calleeExpression = baseCall.psiCall.calleeExpression!!
psiCall = CallTransformer.CallForImplicitInvoke(
explicitExtensionReceiver?.receiver?.receiverValue,
variableReceiver.receiver.receiverValue as ExpressionReceiver, baseCall.psiCall, true)
tracingStrategy = TracingStrategyForInvoke(calleeExpression, psiCall, variableReceiver.receiver.receiverValue.type)
explicitExtensionReceiver?.receiverValue,
variableReceiver.receiverValue as ExpressionReceiver, baseCall.psiCall, true)
tracingStrategy = TracingStrategyForInvoke(calleeExpression, psiCall, variableReceiver.receiverValue!!.type) // check for type parameters
}
}
val ReceiverKotlinCallArgument.receiverValue: ReceiverValue?
get() = when (this) {
is SimpleKotlinCallArgument -> this.receiver.receiverValue
is QualifierReceiverKotlinCallArgument -> this.receiver.classValueReceiver
else -> null
}