From 3a4b7e07f810c3a7340b759650d4331c21dc6399 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Fri, 20 Dec 2013 17:27:16 +0400
Subject: [PATCH] Conversion on copy paste: Copy element as text in case it
 can't be converted

---
 .../conversion/copy/JavaCopyPastePostProcessor.kt |  8 +++++++-
 .../copyPaste/conversion/Arithmetic.expected.kt   |  1 +
 .../testData/copyPaste/conversion/Arithmetic.java |  3 +++
 .../copyPaste/conversion/Arithmetic.to.kt         |  1 +
 .../conversion/OnlyOneBraceFromBlock.expected.kt  |  4 ++++
 .../conversion/OnlyOneBraceFromBlock.java         |  5 +++++
 .../conversion/OnlyOneBraceFromBlock.to.kt        |  3 +++
 .../SingleWordFromIdentifier.expected.kt          |  1 +
 .../conversion/SingleWordFromIdentifier.java      |  3 +++
 .../conversion/SingleWordFromIdentifier.to.kt     |  1 +
 ...aToKotlinCopyPasteConversionTestGenerated.java | 15 +++++++++++++++
 11 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/copyPaste/conversion/Arithmetic.expected.kt
 create mode 100644 idea/testData/copyPaste/conversion/Arithmetic.java
 create mode 100644 idea/testData/copyPaste/conversion/Arithmetic.to.kt
 create mode 100644 idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.expected.kt
 create mode 100644 idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java
 create mode 100644 idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.to.kt
 create mode 100644 idea/testData/copyPaste/conversion/SingleWordFromIdentifier.expected.kt
 create mode 100644 idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java
 create mode 100644 idea/testData/copyPaste/conversion/SingleWordFromIdentifier.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 116aad44de0..4562d89a493 100644
--- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.kt
@@ -107,7 +107,13 @@ public class JavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBlockTran
                 break;
             }
             val elementToConvert = findTopMostParentWhollyInRange(currentRange, leafElement)
-            result.append(converter.elementToKotlin(elementToConvert))
+            val converted = converter.elementToKotlin(elementToConvert)
+            if (converted.isNotEmpty()) {
+                result.append(converted)
+            }
+            else {
+                result.append(elementToConvert.getText())
+            }
             val endOfConverted = elementToConvert.getTextRange()!!.getEndOffset()
             currentRange = TextRange(endOfConverted, currentRange.getEndOffset())
         }
diff --git a/idea/testData/copyPaste/conversion/Arithmetic.expected.kt b/idea/testData/copyPaste/conversion/Arithmetic.expected.kt
new file mode 100644
index 00000000000..6dbd2d6ad9b
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/Arithmetic.expected.kt
@@ -0,0 +1 @@
+b - c + d
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/Arithmetic.java b/idea/testData/copyPaste/conversion/Arithmetic.java
new file mode 100644
index 00000000000..eec7aac9280
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/Arithmetic.java
@@ -0,0 +1,3 @@
+public static void main(String[]args){
+    a + <selection>b - c + d</selection> - e
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/Arithmetic.to.kt b/idea/testData/copyPaste/conversion/Arithmetic.to.kt
new file mode 100644
index 00000000000..81389d50841
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/Arithmetic.to.kt
@@ -0,0 +1 @@
+<caret>
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.expected.kt b/idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.expected.kt
new file mode 100644
index 00000000000..1b35a12f474
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.expected.kt
@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    {
+        val a = Object()
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java b/idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java
new file mode 100644
index 00000000000..754dde0d9b4
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java
@@ -0,0 +1,5 @@
+class A {
+    public static void main(String[] args) <selection>{
+        Object a = new Object();</selection>
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.to.kt b/idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.to.kt
new file mode 100644
index 00000000000..0b0e220a256
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.to.kt
@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    <caret>
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.expected.kt b/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.expected.kt
new file mode 100644
index 00000000000..8440d15718f
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.expected.kt
@@ -0,0 +1 @@
+class 
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java b/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java
new file mode 100644
index 00000000000..8ccb50accb5
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java
@@ -0,0 +1,3 @@
+<selection>class Some</selection>InterestingClass {
+
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.to.kt b/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.to.kt
new file mode 100644
index 00000000000..81389d50841
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/SingleWordFromIdentifier.to.kt
@@ -0,0 +1 @@
+<caret>
\ 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 615ba08dd86..defc50b185c 100644
--- a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
@@ -36,6 +36,11 @@ public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaTo
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/copyPaste/conversion"), Pattern.compile("^(.+)\\.java$"), true);
     }
     
+    @TestMetadata("Arithmetic.java")
+    public void testArithmetic() throws Exception {
+        doTest("idea/testData/copyPaste/conversion/Arithmetic.java");
+    }
+    
     @TestMetadata("Constructor.java")
     public void testConstructor() throws Exception {
         doTest("idea/testData/copyPaste/conversion/Constructor.java");
@@ -66,6 +71,11 @@ public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaTo
         doTest("idea/testData/copyPaste/conversion/OnlyClosingBrace.java");
     }
     
+    @TestMetadata("OnlyOneBraceFromBlock.java")
+    public void testOnlyOneBraceFromBlock() throws Exception {
+        doTest("idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java");
+    }
+    
     @TestMetadata("OnlyQualifier.java")
     public void testOnlyQualifier() throws Exception {
         doTest("idea/testData/copyPaste/conversion/OnlyQualifier.java");
@@ -81,4 +91,9 @@ public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaTo
         doTest("idea/testData/copyPaste/conversion/SeveralMethodsSample.java");
     }
     
+    @TestMetadata("SingleWordFromIdentifier.java")
+    public void testSingleWordFromIdentifier() throws Exception {
+        doTest("idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java");
+    }
+    
 }