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

KT-13262 related: surround with null check is applicable now also for qualified calls with argument type mismatch

Browse Source 
(cherry picked from commit 8f13c84)
This commit is contained in:
Mikhail Glukhikh
2016-07-28 12:40:53 +03:00
committed by Mikhail Glukhikh
parent b7fd41844d
commit 39090113e9
4 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/SurroundWithNullCheckFix.kt
+5 -2
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
import org.jetbrains.kotlin.idea.util.getResolutionScope
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getLastParentOfTypeInRow
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate
import org.jetbrains.kotlin.resolve.calls.callUtil.getType
@@ -93,13 +94,15 @@ class SurroundWithNullCheckFix(
val nullableExpression = typeMismatch.psiElement as? KtReferenceExpression ?: return null
val argument = nullableExpression.parent as? KtValueArgument ?: return null
val call = argument.getParentOfType<KtCallExpression>(true) ?: return null
if (call.parent !is KtBlockExpression) return null
val rootCall = call.getLastParentOfTypeInRow<KtQualifiedExpression>() ?: call
if (rootCall.parent !is KtBlockExpression) return null
if (!isNullabilityMismatch(expected = typeMismatch.a, actual = typeMismatch.b)) return null
if (!nullableExpression.isStable()) return null
return SurroundWithNullCheckFix(call, nullableExpression)
return SurroundWithNullCheckFix(rootCall, nullableExpression)
}
}
}