From 834c3f5d6205c03db4b65a503f5ff8ea6ceb94b3 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Tue, 31 Jan 2017 20:36:08 +0300
Subject: [PATCH] if-then --> elvis: run write action manually to avoid AWT
 events inside

---
 .../intentions/IfThenToElvisIntention.kt      | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
index 05aa9378676..ac43b480249 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.idea.intentions.SelfTargetingOffsetIndependentIntent
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.*
 import org.jetbrains.kotlin.idea.intentions.getLeftMostReceiverExpression
 import org.jetbrains.kotlin.idea.intentions.replaceFirstReceiver
+import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
@@ -114,6 +115,8 @@ class IfThenToElvisIntention : SelfTargetingOffsetIndependentIntention<KtIfExpre
         return this
     }
 
+    override fun startInWriteAction() = false
+
     override fun applyTo(element: KtIfExpression, editor: Editor?) {
         val condition = element.condition as KtOperationExpression
 
@@ -142,20 +145,22 @@ class IfThenToElvisIntention : SelfTargetingOffsetIndependentIntention<KtIfExpre
                                               it.typeReference!!)
         }
         val checkedExpression = condition.checkedExpression()!!
-        val replacedLeft = if (left.evaluatesTo(checkedExpression)) {
-            if (condition is KtIsExpression) newReceiver!! else left
-        }
-        else {
-            if (condition is KtIsExpression) {
-                (left as KtDotQualifiedExpression).replaceFirstReceiver(
-                        factory, newReceiver!!, safeAccess = true)
+        val elvis = runWriteAction {
+            val replacedLeft = if (left.evaluatesTo(checkedExpression)) {
+                if (condition is KtIsExpression) newReceiver!! else left
             }
             else {
-                left.insertSafeCalls(factory)
+                if (condition is KtIsExpression) {
+                    (left as KtDotQualifiedExpression).replaceFirstReceiver(
+                            factory, newReceiver!!, safeAccess = true)
+                }
+                else {
+                    left.insertSafeCalls(factory)
+                }
             }
+            val newExpr = element.replaced(factory.createExpressionByPattern("$0 ?: $1", replacedLeft, right))
+            KtPsiUtil.deparenthesize(newExpr) as KtBinaryExpression
         }
-        val newExpr = element.replaced(factory.createExpressionByPattern("$0 ?: $1", replacedLeft, right))
-        val elvis = KtPsiUtil.deparenthesize(newExpr) as KtBinaryExpression
 
         if (editor != null) {
             elvis.inlineLeftSideIfApplicableWithPrompt(editor)