From cae366f97e2a20da5bc3ba66615d0bce7590f815 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Mon, 25 Apr 2016 19:43:37 +0300
Subject: [PATCH] Revert write actions in utility code (EA-81892)

Revert commits:
ab0fe0a9004089a59554d67fc65b39fd67aef71a
97a97614b5598277b92ea034d22be15e4dadd594
---
 .../jetbrains/kotlin/idea/core/ShortenReferences.kt   |  3 +--
 .../kotlin/idea/util/ImportInsertHelperImpl.kt        | 11 ++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
index 1bd4e5fcbb3..eecd68030d3 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
@@ -33,7 +33,6 @@ import org.jetbrains.kotlin.idea.imports.getImportableTargets
 import org.jetbrains.kotlin.idea.util.ImportDescriptorResult
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
 import org.jetbrains.kotlin.idea.util.getResolutionScope
-import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
@@ -299,7 +298,7 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
         override fun qualifier(element: KtUserType) = element.qualifier!!
 
         override fun shortenElement(element: KtUserType): KtElement {
-            runWriteAction { element.deleteQualifier() }
+            element.deleteQualifier()
             return element
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
index 0eb93e2de62..8e0aaf9253a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.idea.project.platform
 import org.jetbrains.kotlin.idea.refactoring.fqName.isImported
 import org.jetbrains.kotlin.idea.util.ImportDescriptorResult
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
-import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.idea.util.getFileResolutionScope
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.name.FqName
@@ -399,7 +398,7 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
             val psiFactory = KtPsiFactory(project)
             if (file is KtCodeFragment) {
                 val newDirective = psiFactory.createImportDirective(importPath)
-                runWriteAction { file.addImportsFromString(newDirective.text) }
+                file.addImportsFromString(newDirective.text)
                 return newDirective
             }
 
@@ -408,10 +407,8 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
                 val newDirective = psiFactory.createImportDirective(importPath)
                 val imports = importList.imports
                 if (imports.isEmpty()) { //TODO: strange hack
-                    return runWriteAction<KtImportDirective> {
-                        importList.add(psiFactory.createNewLine())
-                        importList.add(newDirective) as KtImportDirective
-                    }
+                    importList.add(psiFactory.createNewLine())
+                    return importList.add(newDirective) as KtImportDirective
                 }
                 else {
                     val insertAfter = imports
@@ -419,7 +416,7 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
                                 val directivePath = it.importPath
                                 directivePath != null && ImportPathComparator.compare(directivePath, importPath) <= 0
                             }
-                    return runWriteAction { importList.addAfter(newDirective, insertAfter) as KtImportDirective }
+                    return importList.addAfter(newDirective, insertAfter) as KtImportDirective
                 }
             }
             else {