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

IfThenToDoubleBang: fix AWT from writeAction problem

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-05-04 16:42:10 +03:00
parent 66c5717adc
commit f3ee5ea45f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt
+9 -2
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
import org.jetbrains.kotlin.idea.intentions.branchedTransformations.* import org.jetbrains.kotlin.idea.intentions.branchedTransformations.*
import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.endOffset import org.jetbrains.kotlin.psi.psiUtil.endOffset
import org.jetbrains.kotlin.psi.psiUtil.startOffset import org.jetbrains.kotlin.psi.psiUtil.startOffset
@@ -49,10 +50,16 @@ class IfThenToDoubleBangIntention : SelfTargetingRangeIntention<KtIfExpression>(
return TextRange(element.startOffset, rParen.endOffset) return TextRange(element.startOffset, rParen.endOffset)
} }
override fun startInWriteAction() = false
override fun applyTo(element: KtIfExpression, editor: Editor?) { override fun applyTo(element: KtIfExpression, editor: Editor?) {
val (_, _, receiverExpression) = element.buildSelectTransformationData() ?: return val (_, _, receiverExpression) = element.buildSelectTransformationData() ?: return
val result = element.replace(KtPsiFactory(element).createExpressionByPattern("$0!!", receiverExpression)) as KtPostfixExpression val result = runWriteAction {
element.replace(KtPsiFactory(element).createExpressionByPattern("$0!!", receiverExpression)) as KtPostfixExpression
}
result.inlineBaseExpressionIfApplicableWithPrompt(editor) if (editor != null) {
result.inlineBaseExpressionIfApplicableWithPrompt(editor)
}
} }
} }