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

Minor: surround with null check: partial analysis

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-10-27 12:52:35 +03:00
parent 046c55a7ac
commit 7d242c5c77
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/SurroundWithNullCheckFix.kt
+3 -1
View File
@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsExpression import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsExpression
import org.jetbrains.kotlin.resolve.calls.callUtil.getType import org.jetbrains.kotlin.resolve.calls.callUtil.getType
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.types.typeUtil.isNullabilityMismatch import org.jetbrains.kotlin.types.typeUtil.isNullabilityMismatch
class SurroundWithNullCheckFix( class SurroundWithNullCheckFix(
@@ -55,7 +56,7 @@ class SurroundWithNullCheckFix(
override fun createAction(diagnostic: Diagnostic): IntentionAction? { override fun createAction(diagnostic: Diagnostic): IntentionAction? {
val element = diagnostic.psiElement val element = diagnostic.psiElement
val expressionParent = element.getParentOfType<KtExpression>(strict = element is KtOperationReferenceExpression) ?: return null val expressionParent = element.getParentOfType<KtExpression>(strict = element is KtOperationReferenceExpression) ?: return null
val context = expressionParent.analyze() val context = expressionParent.analyze(BodyResolveMode.PARTIAL)
val parent = element.parent val parent = element.parent
val nullableExpression = val nullableExpression =
@@ -71,6 +72,7 @@ class SurroundWithNullCheckFix(
val expressionTarget = expressionParent.getParentOfTypesAndPredicate(strict = false, parentClasses = KtExpression::class.java) { val expressionTarget = expressionParent.getParentOfTypesAndPredicate(strict = false, parentClasses = KtExpression::class.java) {
!it.isUsedAsExpression(context) !it.isUsedAsExpression(context)
} ?: return null } ?: return null
// Surround declaration (even of local variable) with null check is generally a bad idea
if (expressionTarget is KtDeclaration) return null if (expressionTarget is KtDeclaration) return null
return SurroundWithNullCheckFix(expressionTarget, nullableExpression) return SurroundWithNullCheckFix(expressionTarget, nullableExpression)