From 70d24d01087b20daa1bb947c7d06e56e44ac0293 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Fri, 7 Apr 2017 16:34:42 +0300
Subject: [PATCH] Fix NoSwingUnderWriteActionException in
 KotlinAndroidAddStringResource

---
 .../KotlinAndroidAddStringResource.kt         | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/intention/KotlinAndroidAddStringResource.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/intention/KotlinAndroidAddStringResource.kt
index b4986479775..fb9bcfd2751 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/intention/KotlinAndroidAddStringResource.kt
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/intention/KotlinAndroidAddStringResource.kt
@@ -40,6 +40,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
 import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.idea.intentions.SelfTargetingIntention
+import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
@@ -60,6 +61,8 @@ class KotlinAndroidAddStringResource : SelfTargetingIntention<KtLiteralStringTem
         private val RESOURCE_DIR_ERROR = "check.resource.dir.error"
     }
 
+    override fun startInWriteAction(): Boolean = false
+
     override fun isApplicableTo(element: KtLiteralStringTemplateEntry, caretOffset: Int): Boolean {
         if (AndroidFacet.getInstance(element.containingFile) == null) {
             return false
@@ -91,19 +94,20 @@ class KotlinAndroidAddStringResource : SelfTargetingIntention<KtLiteralStringTem
 
         val parameters = getCreateXmlResourceParameters(facet.module, element, file.virtualFile) ?: return
 
-        if (!AndroidResourceUtil.createValueResource(project, parameters.resourceDirectory, parameters.name, ResourceType.STRING,
-                                                     parameters.fileName, parameters.directoryNames, parameters.value)) {
-            return
-        }
+        runWriteAction {
+            if (!AndroidResourceUtil.createValueResource(project, parameters.resourceDirectory, parameters.name, ResourceType.STRING,
+                                                         parameters.fileName, parameters.directoryNames, parameters.value)) {
+                return@runWriteAction
+            }
 
-        createResourceReference(facet.module, editor, file, element, manifestPackage, parameters.name, ResourceType.STRING)
-        PsiDocumentManager.getInstance(project).commitAllDocuments()
-        UndoUtil.markPsiFileForUndo(file)
+            createResourceReference(facet.module, editor, file, element, manifestPackage, parameters.name, ResourceType.STRING)
+            PsiDocumentManager.getInstance(project).commitAllDocuments()
+            UndoUtil.markPsiFileForUndo(file)
+        }
     }
 
     private fun getCreateXmlResourceParameters(module: Module, element: KtLiteralStringTemplateEntry,
                                                contextFile: VirtualFile): CreateXmlResourceParameters? {
-
         val stringValue = element.text
 
         val showDialog = !ApplicationManager.getApplication().isUnitTestMode