From 46ff959415ec0f086afdffb73c6f2b4bba16014a Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 30 Jul 2019 13:59:55 +0300 Subject: [PATCH] Fix using invalidated PSI element in Remove Braces Intention #EA-142427 fixed --- .../jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt index f056cbd7299..00e2c5dd448 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt @@ -58,6 +58,7 @@ class RemoveBracesIntention : SelfTargetingIntention(KtElement::class override fun applyTo(element: KtElement, editor: Editor?) { val block = element.findChildBlock() ?: return + val factory = KtPsiFactory(element) val statement = block.statements.single() val caretOnAfterStatement = if (editor != null) editor.caretModel.offset >= statement.endOffset else false @@ -67,8 +68,6 @@ class RemoveBracesIntention : SelfTargetingIntention(KtElement::class val newElement = block.replace(statement.copy()) editor?.caretModel?.moveToOffset(if (caretOnAfterStatement) newElement.endOffset else newElement.startOffset) - - val factory = KtPsiFactory(block) if (construct is KtDoWhileExpression) { newElement.parent!!.addAfter(factory.createNewLine(), newElement)