From bc258fa8565e009605f764c09743366c4d42f7f9 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 9 Apr 2019 15:15:55 +0300 Subject: [PATCH] Fix RemoveUselessIsCheckFixForWhen - don't assert psi state in quick fixes (EA-141206) --- .../kotlin/idea/quickfix/RemoveUselessIsCheckFixForWhen.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUselessIsCheckFixForWhen.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUselessIsCheckFixForWhen.kt index 9f48ca1b0c9..833f9ec4829 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUselessIsCheckFixForWhen.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUselessIsCheckFixForWhen.kt @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project -import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType @@ -37,7 +36,8 @@ class RemoveUselessIsCheckFixForWhen(element: KtWhenConditionIsPattern) : Kotlin condition.parent.delete() } else { whenExpression.entries.dropWhile { it != whenEntry }.forEach { it.delete() } - val newEntry = KtPsiFactory(project).createWhenEntry("else -> ${whenEntry.expression!!.text}") + val whenEntryExpression = whenEntry.expression ?: return + val newEntry = KtPsiFactory(project).createWhenEntry("else -> ${whenEntryExpression.text}") whenExpression.addBefore(newEntry, whenExpression.closeBrace) } }