From 5408c6ea7768ecf64291f9e89b57956e53b9f851 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Fri, 20 Dec 2013 18:16:06 +0400
Subject: [PATCH] Conversion on copy paste: Copy elements that are partially
 selected as text

---
 .../conversion/copy/JavaCopyPastePostProcessor.kt     |  7 ++++++-
 .../conversion/HalfTheWhiteSpace.expected.kt          | 11 +++++++++++
 .../copyPaste/conversion/HalfTheWhiteSpace.java       | 10 ++++++++++
 .../copyPaste/conversion/HalfTheWhiteSpace.to.kt      |  6 ++++++
 .../conversion/SingleWordFromIdentifier.expected.kt   |  2 +-
 .../JavaToKotlinCopyPasteConversionTestGenerated.java |  5 +++++
 6 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
 create mode 100644 idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java
 create mode 100644 idea/testData/copyPaste/conversion/HalfTheWhiteSpace.to.kt

diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.kt
index 4562d89a493..bab94f5f282 100644
--- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.kt
@@ -101,12 +101,17 @@ public class JavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBlockTran
                                      converter: Converter): String {
         val result = StringBuilder()
         var currentRange = range
+        val fileText = file.getText()!!
         while (!currentRange.isEmpty()) {
             val leafElement = findFirstLeafElementWhollyInRange(file, currentRange)
             if (leafElement == null) {
-                break;
+                val unconvertedSuffix = fileText.substring(currentRange.getStartOffset(), currentRange.getEndOffset())
+                result.append(unconvertedSuffix)
+                break
             }
             val elementToConvert = findTopMostParentWhollyInRange(currentRange, leafElement)
+            val unconvertedPrefix = fileText.substring(currentRange.getStartOffset(), elementToConvert.getTextRange()!!.getStartOffset())
+            result.append(unconvertedPrefix)
             val converted = converter.elementToKotlin(elementToConvert)
             if (converted.isNotEmpty()) {
                 result.append(converted)
diff --git a/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
new file mode 100644
index 00000000000..a496d3889b3
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
@@ -0,0 +1,11 @@
+class A {
+
+
+    fun foo() {}
+
+    fun bar() {}
+
+
+
+    fun f() {}
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java
new file mode 100644
index 00000000000..6b40aa4716f
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java
@@ -0,0 +1,10 @@
+class A {
+
+    <selection>
+    void foo() {}
+
+    void bar() {}
+
+    </selection>
+    void foobar() {}
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.to.kt b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.to.kt
new file mode 100644
index 00000000000..12d044e6de4
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.to.kt
@@ -0,0 +1,6 @@
+class A {
+
+    <caret>
+
+    fun f() {}
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.expected.kt b/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.expected.kt
index 8440d15718f..0bfdbcff9f7 100644
--- a/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.expected.kt
+++ b/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.expected.kt
@@ -1 +1 @@
-class 
\ No newline at end of file
+class Some
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
index defc50b185c..f6c6bbb0b06 100644
--- a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
@@ -46,6 +46,11 @@ public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaTo
         doTest("idea/testData/copyPaste/conversion/Constructor.java");
     }
     
+    @TestMetadata("HalfTheWhiteSpace.java")
+    public void testHalfTheWhiteSpace() throws Exception {
+        doTest("idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java");
+    }
+    
     @TestMetadata("Imports1.java")
     public void testImports1() throws Exception {
         doTest("idea/testData/copyPaste/conversion/Imports1.java");