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

Fix RemoveUselessIsCheckFixForWhen - don't assert psi state in quick fixes (EA-141206)

Browse Source
This commit is contained in:
Nikolay Krasko
2019-04-09 15:15:55 +03:00
parent 55b2a7d051
commit bc258fa856
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUselessIsCheckFixForWhen.kt
+2 -2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.quickfix
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
@@ -37,7 +36,8 @@ class RemoveUselessIsCheckFixForWhen(element: KtWhenConditionIsPattern) : Kotlin
condition.parent.delete() condition.parent.delete()
} else { } else {
whenExpression.entries.dropWhile { it != whenEntry }.forEach { it.delete() } 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) whenExpression.addBefore(newEntry, whenExpression.closeBrace)
} }
} }