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

Fix using invalidated PSI element in Remove Braces Intention

Browse Source 
#EA-142427 fixed
This commit is contained in:
Ilya Kirillov
2019-07-30 13:59:55 +03:00
parent 65b0a5f903
commit 46ff959415
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt
+1 -2
View File
@@ -58,6 +58,7 @@ class RemoveBracesIntention : SelfTargetingIntention<KtElement>(KtElement::class
override fun applyTo(element: KtElement, editor: Editor?) { override fun applyTo(element: KtElement, editor: Editor?) {
val block = element.findChildBlock() ?: return val block = element.findChildBlock() ?: return
val factory = KtPsiFactory(element)
val statement = block.statements.single() val statement = block.statements.single()
val caretOnAfterStatement = if (editor != null) editor.caretModel.offset >= statement.endOffset else false val caretOnAfterStatement = if (editor != null) editor.caretModel.offset >= statement.endOffset else false
@@ -68,8 +69,6 @@ class RemoveBracesIntention : SelfTargetingIntention<KtElement>(KtElement::class
val newElement = block.replace(statement.copy()) val newElement = block.replace(statement.copy())
editor?.caretModel?.moveToOffset(if (caretOnAfterStatement) newElement.endOffset else newElement.startOffset) editor?.caretModel?.moveToOffset(if (caretOnAfterStatement) newElement.endOffset else newElement.startOffset)
val factory = KtPsiFactory(block)
if (construct is KtDoWhileExpression) { if (construct is KtDoWhileExpression) {
newElement.parent!!.addAfter(factory.createNewLine(), newElement) newElement.parent!!.addAfter(factory.createNewLine(), newElement)
} }