From 64e5baade32ac7da49e6952db13cbcb2ca079f58 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Fri, 16 Sep 2016 13:43:49 +0300
Subject: [PATCH] Move to Companion: Fix AssertionError on running refactoring
 from Conflicts View  #KT-13874 Fixed

---
 ChangeLog.md                                               | 1 +
 .../intentions/MoveMemberOutOfCompanionObjectIntention.kt  | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index ced42497094..6c9c97e4fc7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -112,6 +112,7 @@ These artifacts include extensions for the types available in the latter JDKs, s
 
 - [`KT-9490`](https://youtrack.jetbrains.com/issue/KT-9490) Convert receiver to parameter: use template instead of the dialog
 - [`KT-11483`](https://youtrack.jetbrains.com/issue/KT-11483) Move to Companion: Do not use qualified names as labels
+- [`KT-13874`](https://youtrack.jetbrains.com/issue/KT-13874) Move to Companion: Fix AssertionError on running refactoring from Conflicts View
 
 ##### New features
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberOutOfCompanionObjectIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberOutOfCompanionObjectIntention.kt
index 55bcffc960a..6871b83b4ef 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberOutOfCompanionObjectIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberOutOfCompanionObjectIntention.kt
@@ -24,6 +24,7 @@ import com.intellij.util.containers.MultiMap
 import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively
 import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.*
 import org.jetbrains.kotlin.idea.refactoring.runSynchronouslyWithProgress
+import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 import org.jetbrains.kotlin.psi.psiUtil.isAncestor
@@ -73,8 +74,10 @@ class MoveMemberOutOfCompanionObjectIntention : SelfTargetingRangeIntention<KtNa
         }
 
         project.checkConflictsInteractively(conflicts) {
-            Mover.Default(element, targetClass)
-            deleteCompanionIfEmpty()
+            runWriteAction {
+                Mover.Default(element, targetClass)
+                deleteCompanionIfEmpty()
+            }
         }
     }
 }
\ No newline at end of file