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

[NI] Don't forget to deparenthesize expression before type checking

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-08-09 12:26:57 +03:00
parent 053b02e0df
commit 4a74ca568c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
+3 -2
View File
@@ -159,8 +159,9 @@ class DiagnosticReporterByTrackingStrategy(
?: (position as? ReceiverConstraintPosition)?.argument ?: (position as? ReceiverConstraintPosition)?.argument
argument?.let { argument?.let {
val expression = it.psiExpression ?: return val expression = it.psiExpression ?: return
if (reportConstantTypeMismatch(constraintError, expression)) return val deparenthesized = KtPsiUtil.safeDeparenthesize(expression)
trace.report(Errors.TYPE_MISMATCH.on(expression, constraintError.upperType, constraintError.lowerType)) if (reportConstantTypeMismatch(constraintError, deparenthesized)) return
trace.report(Errors.TYPE_MISMATCH.on(deparenthesized, constraintError.upperType, constraintError.lowerType))
} }
(position as? ExplicitTypeParameterConstraintPosition)?.let { (position as? ExplicitTypeParameterConstraintPosition)?.let {
val typeArgumentReference = (it.typeArgument as SimpleTypeArgumentImpl).typeReference val typeArgumentReference = (it.typeArgument as SimpleTypeArgumentImpl).typeReference