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

Reformat SurroundWithNullCheckFix

Browse Source
This commit is contained in:
Toshiaki Kameyama
2019-03-01 23:48:46 +09:00
committed by Mikhail Glukhikh
parent f467d892ca
commit 2314a38342
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/SurroundWithNullCheckFix.kt
+10 -10
View File
@@ -34,8 +34,8 @@ 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(
expression: KtExpression, expression: KtExpression,
nullableExpression: KtExpression nullableExpression: KtExpression
) : KotlinQuickFixAction<KtExpression>(expression), HighPriorityAction { ) : KotlinQuickFixAction<KtExpression>(expression), HighPriorityAction {
private val nullableExpressionPointer = nullableExpression.createSmartPointer() private val nullableExpressionPointer = nullableExpression.createSmartPointer()
@@ -53,9 +53,9 @@ class SurroundWithNullCheckFix(
companion object : KotlinSingleIntentionActionFactory() { companion object : KotlinSingleIntentionActionFactory() {
private fun KtExpression.hasAcceptableParent() = with (parent) { private fun KtExpression.hasAcceptableParent() = with(parent) {
this is KtBlockExpression || this.parent is KtIfExpression || this is KtBlockExpression || this.parent is KtIfExpression ||
this is KtWhenEntry || this.parent is KtLoopExpression this is KtWhenEntry || this.parent is KtLoopExpression
} }
override fun createAction(diagnostic: Diagnostic): IntentionAction? { override fun createAction(diagnostic: Diagnostic): IntentionAction? {
@@ -65,12 +65,12 @@ class SurroundWithNullCheckFix(
val parent = element.parent val parent = element.parent
val nullableExpression = val nullableExpression =
when (parent) { when (parent) {
is KtDotQualifiedExpression -> parent.receiverExpression is KtDotQualifiedExpression -> parent.receiverExpression
is KtBinaryExpression -> parent.left is KtBinaryExpression -> parent.left
is KtCallExpression -> parent.calleeExpression is KtCallExpression -> parent.calleeExpression
else -> return null else -> return null
} as? KtReferenceExpression ?: return null } as? KtReferenceExpression ?: return null
if (!nullableExpression.isStableSimpleExpression(context)) return null if (!nullableExpression.isStableSimpleExpression(context)) return null