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

[NI] Fix reporting type mismatch on lambda parameters

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-04-26 12:09:47 +03:00
committed by Mikhail Zarechenskiy
parent f7091dd1e9
commit d18c55a412
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
+9
View File
@@ -215,6 +215,15 @@ class DiagnosticReporterByTrackingStrategy(
val argument = (position as? ArgumentConstraintPosition)?.argument val argument = (position as? ArgumentConstraintPosition)?.argument
?: (position as? ReceiverConstraintPosition)?.argument ?: (position as? ReceiverConstraintPosition)?.argument
argument?.let { argument?.let {
it.safeAs<LambdaKotlinCallArgument>()?.let lambda@{ lambda ->
val parameterTypes = lambda.parametersTypes?.toList() ?: return@lambda
val index = parameterTypes.indexOf(constraintError.upperType)
val lambdaExpression = lambda.psiExpression as? KtLambdaExpression ?: return@lambda
val parameter = lambdaExpression.valueParameters.getOrNull(index) ?: return@lambda
trace.report(Errors.EXPECTED_PARAMETER_TYPE_MISMATCH.on(parameter, constraintError.upperKotlinType.unCapture()))
return
}
val expression = it.psiExpression ?: return val expression = it.psiExpression ?: return
val deparenthesized = KtPsiUtil.safeDeparenthesize(expression) val deparenthesized = KtPsiUtil.safeDeparenthesize(expression)
if (reportConstantTypeMismatch(constraintError, deparenthesized)) return if (reportConstantTypeMismatch(constraintError, deparenthesized)) return