"if-then to safe access": treat transformation to 'let' as intention

Related to KT-7675
This commit is contained in:
Mikhail Glukhikh
2018-08-15 12:32:51 +03:00
parent f5cfec4a91
commit 5b77def0e0
10 changed files with 20 additions and 41 deletions
@@ -289,15 +289,22 @@ internal fun KtIfExpression.buildSelectTransformationData(): IfThenToSelectData?
return IfThenToSelectData(context, condition, receiverExpression, baseClause, negatedClause)
}
internal fun KtExpression?.isClauseTransformableToLetOnly() =
this is KtCallExpression && resolveToCall()?.getImplicitReceiverValue() == null
internal fun KtIfExpression.shouldBeTransformed(): Boolean {
val condition = condition
return when (condition) {
is KtBinaryExpression -> true
is KtBinaryExpression -> {
val baseClause = (if (condition.operationToken == KtTokens.EQEQ) `else` else then)?.unwrapBlockOrParenthesis()
!baseClause.isClauseTransformableToLetOnly()
}
is KtIsExpression -> {
if (!isMultiLine()) true
else {
val baseClause = (if (condition.isNegated) `else` else then)?.unwrapBlockOrParenthesis()
baseClause !is KtDotQualifiedExpression
val baseClause = (if (condition.isNegated) `else` else then)?.unwrapBlockOrParenthesis()
when {
baseClause.isClauseTransformableToLetOnly() -> false
!isMultiLine() -> true
else -> baseClause !is KtDotQualifiedExpression
}
}
else -> false