K1: rename 'kotlinCall' -> 'selectorCall' in relevant places
This commit is contained in:
committed by
Space Team
parent
bd27ec840c
commit
d76b32daf2
+5
-5
@@ -460,21 +460,21 @@ class DiagnosticReporterByTrackingStrategy(
|
||||
reportArgumentConstraintErrorByPosition(
|
||||
error, position.argument as KotlinCallArgument,
|
||||
isWarning, typeMismatchDiagnostic,
|
||||
kotlinCall = null, report
|
||||
selectorCall = null, report
|
||||
)
|
||||
}
|
||||
is ReceiverConstraintPosition<*> -> {
|
||||
reportArgumentConstraintErrorByPosition(
|
||||
error, position.argument as KotlinCallArgument,
|
||||
isWarning, typeMismatchDiagnostic,
|
||||
kotlinCall = (position as ReceiverConstraintPositionImpl).kotlinCall, report
|
||||
selectorCall = (position as ReceiverConstraintPositionImpl).selectorCall, report
|
||||
)
|
||||
}
|
||||
is LambdaArgumentConstraintPosition<*> -> {
|
||||
reportArgumentConstraintErrorByPosition(
|
||||
error, (position.lambda as ResolvedLambdaAtom).atom,
|
||||
isWarning, typeMismatchDiagnostic,
|
||||
kotlinCall = null, report
|
||||
selectorCall = null, report
|
||||
)
|
||||
}
|
||||
is BuilderInferenceExpectedTypeConstraintPosition -> {
|
||||
@@ -548,7 +548,7 @@ class DiagnosticReporterByTrackingStrategy(
|
||||
argument: KotlinCallArgument,
|
||||
isWarning: Boolean,
|
||||
typeMismatchDiagnostic: DiagnosticFactory2<KtExpression, KotlinType, KotlinType>,
|
||||
kotlinCall: KotlinCall?,
|
||||
selectorCall: KotlinCall?,
|
||||
report: (Diagnostic) -> Unit
|
||||
) {
|
||||
if (argument is LambdaKotlinCallArgument) {
|
||||
@@ -567,7 +567,7 @@ class DiagnosticReporterByTrackingStrategy(
|
||||
}
|
||||
|
||||
val expression = argument.psiExpression ?: run {
|
||||
val psiCall = (kotlinCall as? PSIKotlinCall)?.psiCall ?: psiKotlinCall.psiCall
|
||||
val psiCall = (selectorCall as? PSIKotlinCall)?.psiCall ?: psiKotlinCall.psiCall
|
||||
report(
|
||||
RECEIVER_TYPE_MISMATCH.on(
|
||||
psiCall.calleeExpression ?: psiCall.callElement, error.upperKotlinType, error.lowerKotlinType
|
||||
|
||||
+4
-3
@@ -35,10 +35,11 @@ fun resolveKtPrimitive(
|
||||
receiverInfo: ReceiverInfo,
|
||||
convertedType: UnwrappedType?,
|
||||
inferenceSession: InferenceSession?,
|
||||
kotlinCall: KotlinCall? = null,
|
||||
selectorCall: KotlinCall? = null,
|
||||
): ResolvedAtom = when (argument) {
|
||||
is SimpleKotlinCallArgument ->
|
||||
checkSimpleArgument(csBuilder, argument, expectedType, diagnosticsHolder, receiverInfo, convertedType, inferenceSession, kotlinCall)
|
||||
is SimpleKotlinCallArgument -> checkSimpleArgument(
|
||||
csBuilder, argument, expectedType, diagnosticsHolder, receiverInfo, convertedType, inferenceSession, selectorCall
|
||||
)
|
||||
|
||||
is LambdaKotlinCallArgument ->
|
||||
preprocessLambdaArgument(csBuilder, argument, expectedType, diagnosticsHolder)
|
||||
|
||||
+1
-1
@@ -534,7 +534,7 @@ private fun ResolutionCandidate.resolveKotlinArgument(
|
||||
receiverInfo,
|
||||
convertedArgument?.unknownIntegerType?.unwrap(),
|
||||
inferenceSession,
|
||||
receiverInfo.selectorCall
|
||||
selectorCall = receiverInfo.selectorCall
|
||||
)
|
||||
|
||||
addResolvedKtPrimitive(resolvedAtom)
|
||||
|
||||
+4
-4
@@ -54,10 +54,10 @@ fun checkSimpleArgument(
|
||||
receiverInfo: ReceiverInfo,
|
||||
convertedType: UnwrappedType?,
|
||||
inferenceSession: InferenceSession?,
|
||||
kotlinCall: KotlinCall?
|
||||
selectorCall: KotlinCall?
|
||||
): ResolvedAtom = when (argument) {
|
||||
is ExpressionKotlinCallArgument ->
|
||||
checkExpressionArgument(csBuilder, argument, expectedType, diagnosticsHolder, receiverInfo.isReceiver, convertedType, kotlinCall)
|
||||
checkExpressionArgument(csBuilder, argument, expectedType, diagnosticsHolder, receiverInfo.isReceiver, convertedType, selectorCall)
|
||||
is SubKotlinCallArgument ->
|
||||
checkSubCallArgument(csBuilder, argument, expectedType, diagnosticsHolder, receiverInfo, inferenceSession)
|
||||
else ->
|
||||
@@ -71,7 +71,7 @@ private fun checkExpressionArgument(
|
||||
diagnosticsHolder: KotlinDiagnosticsHolder,
|
||||
isReceiver: Boolean,
|
||||
convertedType: UnwrappedType?,
|
||||
kotlinCall: KotlinCall?
|
||||
selectorCall: KotlinCall?
|
||||
): ResolvedAtom {
|
||||
val resolvedExpression = ResolvedExpressionAtom(expressionArgument)
|
||||
if (expectedType == null) return resolvedExpression
|
||||
@@ -100,7 +100,7 @@ private fun checkExpressionArgument(
|
||||
}
|
||||
|
||||
val position =
|
||||
if (isReceiver) ReceiverConstraintPositionImpl(expressionArgument, kotlinCall)
|
||||
if (isReceiver) ReceiverConstraintPositionImpl(expressionArgument, selectorCall)
|
||||
else ArgumentConstraintPositionImpl(expressionArgument)
|
||||
|
||||
// Used only for arguments with @NotNull annotation
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ class CallableReferenceConstraintPositionImpl(val callableReferenceCall: Callabl
|
||||
|
||||
class ReceiverConstraintPositionImpl(
|
||||
argument: KotlinCallArgument,
|
||||
val kotlinCall: KotlinCall?
|
||||
val selectorCall: KotlinCall?
|
||||
) : ReceiverConstraintPosition<KotlinCallArgument>(argument)
|
||||
|
||||
class FixVariableConstraintPositionImpl(
|
||||
|
||||
Reference in New Issue
Block a user