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

K1: rename 'kotlinCall' -> 'selectorCall' in relevant places

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-04-03 12:11:45 +02:00
committed by Space Team
parent bd27ec840c
commit d76b32daf2
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
+5 -5
View File
@@ -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