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

Remove uncapturing in type mismatch diagnostics

Browse Source 
#KT-32587 Fixed
This commit is contained in:
Pavel Kirpichenkov
2019-09-16 15:10:05 +03:00
parent 5c904250be
commit f45a49b122
6 changed files with 72 additions and 5 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
@@ -257,7 +257,7 @@ class DiagnosticReporterByTrackingStrategy(
val index = parameterTypes.indexOf(constraintError.upperKotlinType.unwrap())
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()))
trace.report(Errors.EXPECTED_PARAMETER_TYPE_MISMATCH.on(parameter, constraintError.upperKotlinType))
return
}
@@ -277,8 +277,8 @@ class DiagnosticReporterByTrackingStrategy(
trace.report(
Errors.TYPE_MISMATCH.on(
deparenthesized,
constraintError.upperKotlinType.unCapture(),
constraintError.lowerKotlinType.unCapture()
constraintError.upperKotlinType,
constraintError.lowerKotlinType
)
)
}
@@ -289,8 +289,8 @@ class DiagnosticReporterByTrackingStrategy(
trace.report(
Errors.TYPE_MISMATCH.on(
it,
constraintError.upperKotlinType.unCapture(),
constraintError.lowerKotlinType.unCapture()
constraintError.upperKotlinType,
constraintError.lowerKotlinType
)
)
}