From d1554217d3ed469c89230b2556f67107836f31d4 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 28 Oct 2016 16:15:38 +0300
Subject: [PATCH] Minor: if then to elvis

(cherry picked from commit 7703994)
---
 .../intentions/IfThenToElvisIntention.kt                      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
index 84219f9b1af..42a69b1111e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
@@ -30,11 +30,8 @@ import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.callUtil.getType
-import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeUtils
-import org.jetbrains.kotlin.types.typeUtil.TypeNullability
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
-import org.jetbrains.kotlin.types.typeUtil.nullability
 
 class IfThenToElvisInspection : IntentionBasedInspection<KtIfExpression>(IfThenToElvisIntention::class)
 
@@ -75,6 +72,7 @@ class IfThenToElvisIntention : SelfTargetingOffsetIndependentIntention<KtIfExpre
             is KtIsExpression -> {
                 val targetType = context[BindingContext.TYPE, condition.typeReference] ?: return false
                 if (TypeUtils.isNullableType(targetType)) return false
+                // The following check can be removed after fix of KT-14576
                 val originalType = condition.leftHandSide.getType(context) ?: return false
                 if (!targetType.isSubtypeOf(originalType)) return false