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

Minor: if then to elvis

Browse Source 
(cherry picked from commit 7703994)
This commit is contained in:
Mikhail Glukhikh
2016-10-28 16:15:38 +03:00
committed by Mikhail Glukhikh
parent be13aa0a3b
commit d1554217d3
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
+1 -3
View File
@@ -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