From 1cf348baba5aebc560bc6a1a1e3b16a0c9f2e928 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 11 Sep 2019 12:23:40 +0300
Subject: [PATCH] Do not commit document on non-kotlin files when trying to
 perform j2k conversion

#KT-33725 fixed
---
 .../idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt
index 3d32a407c85..9e458c3ddc3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt
@@ -107,10 +107,10 @@ class ConvertTextJavaCopyPasteProcessor : CopyPastePostProcessor<TextBlockTransf
         val text = (values.single() as MyTransferableData).text
 
         val psiDocumentManager = PsiDocumentManager.getInstance(project)
-        psiDocumentManager.commitDocument(editor.document)
         val targetFile = psiDocumentManager.getPsiFile(editor.document) as? KtFile ?: return
-        val useNewJ2k = checkUseNewJ2k(targetFile)
+        psiDocumentManager.commitDocument(editor.document)
 
+        val useNewJ2k = checkUseNewJ2k(targetFile)
         val targetModule = targetFile.module
         val pasteTarget = detectPasteTarget(targetFile, bounds.startOffset, bounds.endOffset) ?: return
         val conversionContext = detectConversionContext(pasteTarget.pasteContext, text, project) ?: return