From 586246002cb3845b8615f9cad9504696a783597f Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Wed, 11 Jan 2017 13:54:05 +0300
Subject: [PATCH] Create header implementation fix: do not use Swing inside
 write action

---
 .../CreateHeaderImplementationFix.kt          | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createImpl/CreateHeaderImplementationFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createImpl/CreateHeaderImplementationFix.kt
index 069d2bcd2d5..668c9e13dc3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createImpl/CreateHeaderImplementationFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createImpl/CreateHeaderImplementationFix.kt
@@ -39,6 +39,7 @@ import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
 import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.idea.refactoring.getOrCreateKotlinFile
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.idea.util.projectStructure.allModules
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
@@ -55,14 +56,20 @@ sealed class CreateHeaderImplementationFix<out D : KtNamedDeclaration>(
 
     override fun getText() = "Create header $elementType implementation for platform ${implPlatformKind.name}"
 
+    override fun startInWriteAction() = false
+
     override final fun invoke(project: Project, editor: Editor?, file: KtFile) {
         val element = element ?: return
         val factory = KtPsiFactory(project)
-        val implFile = getOrCreateImplementationFile(project) ?: return
 
-        val implDeclaration = implFile.add(factory.generateIt(project, element) ?: return) as KtElement
-        val reformatted = CodeStyleManager.getInstance(project).reformat(implDeclaration)
-        ShortenReferences.DEFAULT.process(reformatted as KtElement)
+        val implFile = getOrCreateImplementationFile(project) ?: return
+        val generated = factory.generateIt(project, element) ?: return
+
+        runWriteAction {
+            val implDeclaration = implFile.add(generated) as KtElement
+            val reformatted = CodeStyleManager.getInstance(project).reformat(implDeclaration)
+            ShortenReferences.DEFAULT.process(reformatted as KtElement)
+        }
     }
 
     private fun Project.implementationModuleOf(headerModule: Module) =
@@ -85,7 +92,9 @@ sealed class CreateHeaderImplementationFix<out D : KtNamedDeclaration>(
         val implDirectory = PackageUtil.findOrCreateDirectoryForPackage(
                 implModule, headerPackage?.qualifiedName ?: "", null, false
         ) ?: return null
-        return getOrCreateKotlinFile("$name.kt", implDirectory)
+        return runWriteAction {
+            getOrCreateKotlinFile("$name.kt", implDirectory)
+        }
     }
 
     companion object : KotlinSingleIntentionActionFactory() {