From 7e82dd9adc1e8bf2c2272aebb57704bfa5017b1b Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Mon, 7 Nov 2016 19:27:50 +0300
Subject: [PATCH] Fix for KT-14585 J2K, ConvertJavaCopyPasteProcessor shows a
 dialog under write action

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

diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
index 415969a0be2..abecfe2931d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
@@ -135,15 +135,19 @@ class ConvertJavaCopyPasteProcessor : CopyPastePostProcessor<TextBlockTransferab
             val (text, referenceData, explicitImports) = conversionResult!!
             text!! // otherwise we should get true from doConversionAndInsertImportsIfUnchanged and return above
 
+            val boundsAfterReplace =
+                    runWriteAction {
+                        val startOffset = bounds.startOffset
+                        document.replaceString(startOffset, bounds.endOffset, text)
+
+                        val endOffsetAfterCopy = startOffset + text.length
+                        editor.caretModel.moveToOffset(endOffsetAfterCopy)
+                        TextRange(startOffset, endOffsetAfterCopy)
+                    }
+
+            val newBounds = insertImports(boundsAfterReplace, referenceData, explicitImports)
+
             runWriteAction {
-                val startOffset = bounds.startOffset
-                document.replaceString(startOffset, bounds.endOffset, text)
-
-                val endOffsetAfterCopy = startOffset + text.length
-                editor.caretModel.moveToOffset(endOffsetAfterCopy)
-
-                val newBounds = insertImports(TextRange(startOffset, endOffsetAfterCopy), referenceData, explicitImports)
-
                 PsiDocumentManager.getInstance(project).commitAllDocuments()
                 AfterConversionPass(project, J2kPostProcessor(formatCode = true)).run(targetFile, newBounds)