From a63123b556a6f0f66e61fc1c68cd7ec8ae71dc35 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Wed, 8 Jan 2020 14:02:53 +0100
Subject: [PATCH] Handle \r line endings in plaintext j2k

#KT-35831 #EA-209568 Fixed
---
 .../conversion/copy/ConvertTextJavaCopyPasteProcessor.kt  | 4 ++--
 idea/testData/copyPaste/plainTextConversion/KT13529.txt   | 2 +-
 .../AbstractTextJavaToKotlinCopyPasteConversionTest.kt    | 8 +++++---
 3 files changed, 8 insertions(+), 6 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 11c023ba787..8c879f30352 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.idea.conversion.copy
 
 import com.intellij.codeInsight.editorActions.CopyPastePostProcessor
+import com.intellij.codeInsight.editorActions.TextBlockTransferable
 import com.intellij.codeInsight.editorActions.TextBlockTransferableData
 import com.intellij.ide.highlighter.JavaFileType
 import com.intellij.openapi.diagnostic.ControlFlowException
@@ -28,7 +29,6 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Ref
-import com.intellij.openapi.util.TextRange
 import com.intellij.psi.*
 import com.intellij.util.LocalTimeCounter
 import org.jetbrains.annotations.TestOnly
@@ -108,7 +108,7 @@ class ConvertTextJavaCopyPasteProcessor : CopyPastePostProcessor<TextBlockTransf
         if (DumbService.getInstance(project).isDumb) return
         if (!KotlinEditorOptions.getInstance().isEnableJavaToKotlinConversion) return //TODO: use another option?
 
-        val text = (values.single() as MyTransferableData).text
+        val text = TextBlockTransferable.convertLineSeparators(editor, (values.single() as MyTransferableData).text, values)
 
         val psiDocumentManager = PsiDocumentManager.getInstance(project)
         val targetFile = psiDocumentManager.getPsiFile(editor.document) as? KtFile ?: return
diff --git a/idea/testData/copyPaste/plainTextConversion/KT13529.txt b/idea/testData/copyPaste/plainTextConversion/KT13529.txt
index b39760f1511..9ed9ca81ed7 100644
--- a/idea/testData/copyPaste/plainTextConversion/KT13529.txt
+++ b/idea/testData/copyPaste/plainTextConversion/KT13529.txt
@@ -1,4 +1,4 @@
 public class BeatBox {
     private static final String TAG = "BeatBox";
     private static final String SOUNDS_FOLDER = "sample_sounds";
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt
index ff23100d914..2e935504f00 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt
@@ -6,10 +6,12 @@
 package org.jetbrains.kotlin.idea.conversion.copy
 
 import com.intellij.openapi.actionSystem.IdeActions
+import com.intellij.openapi.ide.CopyPasteManager
 import org.jetbrains.kotlin.idea.editor.KotlinEditorOptions
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.KotlinTestUtils
+import java.awt.datatransfer.StringSelection
 import java.io.File
 
 abstract class AbstractTextJavaToKotlinCopyPasteConversionTest : AbstractJ2kCopyPasteTest() {
@@ -33,11 +35,11 @@ abstract class AbstractTextJavaToKotlinCopyPasteConversionTest : AbstractJ2kCopy
         val fileName = fileName()
         myFixture.configureByFile(fileName)
 
-        val fileText = myFixture.editor.document.text
+        val fileText = testDataFile().readText()
         val noConversionExpected = InTextDirectivesUtils.findListWithPrefixes(fileText, "// NO_CONVERSION_EXPECTED").isNotEmpty()
 
-        myFixture.editor.selectionModel.setSelection(0, fileText.length)
-        myFixture.performEditorAction(IdeActions.ACTION_COPY)
+        // copy a file content directly to a buffer to keep it as is (keep original line endings etc)
+        CopyPasteManager.getInstance().setContents(StringSelection(fileText))
 
         configureByDependencyIfExists(fileName.replace(".txt", ".dependency.kt"))
         configureByDependencyIfExists(fileName.replace(".txt", ".dependency.java"))