From 136428c7b43703564ac013700f929e11cae40ae0 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 10 Sep 2018 14:28:12 +0300 Subject: [PATCH] If-then to safe access/elvis: fix mistake in shouldBeTransformed This should fix two inspection tests (implicit receiver case) Before this commit, check of 'this' on null was accidentally not highlighted by if-then to safe access or elvis. Now it is. --- .../idea/intentions/branchedTransformations/IfThenUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt index 675d33f431b..5b2b068c404 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt @@ -313,7 +313,7 @@ internal fun KtIfExpression.shouldBeTransformed(): Boolean { return when (condition) { is KtBinaryExpression -> { val baseClause = (if (condition.operationToken == KtTokens.EQEQ) `else` else then)?.unwrapBlockOrParenthesis() - !baseClause.isClauseTransformableToLetOnly(checkedExpression()) + !baseClause.isClauseTransformableToLetOnly(condition.checkedExpression()) } else -> false }