[NI] Rename: isVariableReceiverForInvoke -> isForImplicitInvoke
This commit is contained in:
+1
-1
@@ -79,7 +79,7 @@ class DiagnosticReporterByTrackingStrategy(
|
|||||||
override fun onCallReceiver(callReceiver: SimpleKotlinCallArgument, diagnostic: KotlinCallDiagnostic) {
|
override fun onCallReceiver(callReceiver: SimpleKotlinCallArgument, diagnostic: KotlinCallDiagnostic) {
|
||||||
when (diagnostic.javaClass) {
|
when (diagnostic.javaClass) {
|
||||||
UnsafeCallError::class.java -> {
|
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)
|
tracingStrategy.unsafeCall(trace, callReceiver.receiver.receiverValue.type, implicitInvokeCheck)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -415,7 +415,7 @@ class PSICallResolver(
|
|||||||
if (variableReceiver.possibleTypes.isNotEmpty()) {
|
if (variableReceiver.possibleTypes.isNotEmpty()) {
|
||||||
return ReceiverExpressionKotlinCallArgument(
|
return ReceiverExpressionKotlinCallArgument(
|
||||||
createReceiverValueWithSmartCastInfo(variable),
|
createReceiverValueWithSmartCastInfo(variable),
|
||||||
isVariableReceiverForInvoke = true
|
isForImplicitInvoke = true
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -470,7 +470,7 @@ class PSICallResolver(
|
|||||||
forcedExplicitReceiver: Receiver? = null
|
forcedExplicitReceiver: Receiver? = null
|
||||||
): PSIKotlinCallImpl {
|
): PSIKotlinCallImpl {
|
||||||
val resolvedExplicitReceiver = resolveReceiver(
|
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)
|
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" }
|
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
|
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(
|
private fun resolveReceiver(
|
||||||
context: BasicCallResolutionContext,
|
context: BasicCallResolutionContext,
|
||||||
oldReceiver: Receiver?,
|
oldReceiver: Receiver?,
|
||||||
isSafeCall: Boolean,
|
isSafeCall: Boolean,
|
||||||
isVariableReceiverForInvoke: Boolean
|
isForImplicitInvoke: Boolean
|
||||||
): ReceiverKotlinCallArgument? =
|
): ReceiverKotlinCallArgument? =
|
||||||
when (oldReceiver) {
|
when (oldReceiver) {
|
||||||
null -> null
|
null -> null
|
||||||
@@ -564,7 +564,7 @@ class PSICallResolver(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
subCallArgument ?: ReceiverExpressionKotlinCallArgument(detailedReceiver, isSafeCall, isVariableReceiverForInvoke)
|
subCallArgument ?: ReceiverExpressionKotlinCallArgument(detailedReceiver, isSafeCall, isForImplicitInvoke)
|
||||||
}
|
}
|
||||||
else -> error("Incorrect receiver: $oldReceiver")
|
else -> error("Incorrect receiver: $oldReceiver")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ class FakeKotlinCallArgumentForCallableReference(
|
|||||||
class ReceiverExpressionKotlinCallArgument private constructor(
|
class ReceiverExpressionKotlinCallArgument private constructor(
|
||||||
override val receiver: ReceiverValueWithSmartCastInfo,
|
override val receiver: ReceiverValueWithSmartCastInfo,
|
||||||
override val isSafeCall: Boolean = false,
|
override val isSafeCall: Boolean = false,
|
||||||
val isVariableReceiverForInvoke: Boolean = false
|
val isForImplicitInvoke: Boolean = false
|
||||||
) : ExpressionKotlinCallArgument {
|
) : ExpressionKotlinCallArgument {
|
||||||
override val isSpread: Boolean get() = false
|
override val isSpread: Boolean get() = false
|
||||||
override val argumentName: Name? get() = null
|
override val argumentName: Name? get() = null
|
||||||
@@ -42,7 +42,7 @@ class ReceiverExpressionKotlinCallArgument private constructor(
|
|||||||
operator fun invoke(
|
operator fun invoke(
|
||||||
receiver: ReceiverValueWithSmartCastInfo,
|
receiver: ReceiverValueWithSmartCastInfo,
|
||||||
isSafeCall: Boolean = false,
|
isSafeCall: Boolean = false,
|
||||||
isVariableReceiverForInvoke: Boolean = false
|
isForImplicitInvoke: Boolean = false
|
||||||
) = ReceiverExpressionKotlinCallArgument(receiver.prepareReceiverRegardingCaptureTypes(), isSafeCall, isVariableReceiverForInvoke)
|
) = ReceiverExpressionKotlinCallArgument(receiver.prepareReceiverRegardingCaptureTypes(), isSafeCall, isForImplicitInvoke)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user