diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt index c2955463aeb..5561999c986 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt @@ -79,7 +79,7 @@ class DiagnosticReporterByTrackingStrategy( override fun onCallReceiver(callReceiver: SimpleKotlinCallArgument, diagnostic: KotlinCallDiagnostic) { when (diagnostic.javaClass) { UnsafeCallError::class.java -> { - val implicitInvokeCheck = (callReceiver as? ReceiverExpressionKotlinCallArgument)?.isVariableReceiverForInvoke ?: false + val implicitInvokeCheck = (callReceiver as? ReceiverExpressionKotlinCallArgument)?.isForImplicitInvoke ?: false tracingStrategy.unsafeCall(trace, callReceiver.receiver.receiverValue.type, implicitInvokeCheck) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt index 5c53e0c09e7..02405c8eeb9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt @@ -415,7 +415,7 @@ class PSICallResolver( if (variableReceiver.possibleTypes.isNotEmpty()) { return ReceiverExpressionKotlinCallArgument( createReceiverValueWithSmartCastInfo(variable), - isVariableReceiverForInvoke = true + isForImplicitInvoke = true ) } @@ -470,7 +470,7 @@ class PSICallResolver( forcedExplicitReceiver: Receiver? = null ): PSIKotlinCallImpl { val resolvedExplicitReceiver = resolveReceiver( - context, forcedExplicitReceiver ?: oldCall.explicitReceiver, oldCall.isSafeCall(), isVariableReceiverForInvoke = false + context, forcedExplicitReceiver ?: oldCall.explicitReceiver, oldCall.isSafeCall(), isForImplicitInvoke = false ) val dispatchReceiverForInvoke = resolveDispatchReceiverForInvoke(context, kotlinCallKind, oldCall) @@ -529,14 +529,14 @@ class PSICallResolver( require(oldCall is CallTransformer.CallForImplicitInvoke) { "Call should be CallForImplicitInvoke, but it is: $oldCall" } val dispatchReceiver = oldCall.dispatchReceiver!! // dispatch receiver from CallForImplicitInvoke is always not null - return resolveReceiver(context, dispatchReceiver, isSafeCall = false, isVariableReceiverForInvoke = true) + return resolveReceiver(context, dispatchReceiver, isSafeCall = false, isForImplicitInvoke = true) } private fun resolveReceiver( context: BasicCallResolutionContext, oldReceiver: Receiver?, isSafeCall: Boolean, - isVariableReceiverForInvoke: Boolean + isForImplicitInvoke: Boolean ): ReceiverKotlinCallArgument? = when (oldReceiver) { null -> null @@ -564,7 +564,7 @@ class PSICallResolver( } } - subCallArgument ?: ReceiverExpressionKotlinCallArgument(detailedReceiver, isSafeCall, isVariableReceiverForInvoke) + subCallArgument ?: ReceiverExpressionKotlinCallArgument(detailedReceiver, isSafeCall, isForImplicitInvoke) } else -> error("Incorrect receiver: $oldReceiver") } diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ArgumentsImpl.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ArgumentsImpl.kt index 597cd4a8888..6745f0b1b33 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ArgumentsImpl.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ArgumentsImpl.kt @@ -31,7 +31,7 @@ class FakeKotlinCallArgumentForCallableReference( class ReceiverExpressionKotlinCallArgument private constructor( override val receiver: ReceiverValueWithSmartCastInfo, override val isSafeCall: Boolean = false, - val isVariableReceiverForInvoke: Boolean = false + val isForImplicitInvoke: Boolean = false ) : ExpressionKotlinCallArgument { override val isSpread: Boolean get() = false override val argumentName: Name? get() = null @@ -42,7 +42,7 @@ class ReceiverExpressionKotlinCallArgument private constructor( operator fun invoke( receiver: ReceiverValueWithSmartCastInfo, isSafeCall: Boolean = false, - isVariableReceiverForInvoke: Boolean = false - ) = ReceiverExpressionKotlinCallArgument(receiver.prepareReceiverRegardingCaptureTypes(), isSafeCall, isVariableReceiverForInvoke) + isForImplicitInvoke: Boolean = false + ) = ReceiverExpressionKotlinCallArgument(receiver.prepareReceiverRegardingCaptureTypes(), isSafeCall, isForImplicitInvoke) } }