From 160f897806db174b97aa41ae7a3480fae47a60d3 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 9 Jan 2014 17:31:20 +0400
Subject: [PATCH] Conversion on copy paste: Reformat code after conversion

---
 .../plugin/conversion/copy/JavaCopyPastePostProcessor.kt | 9 +++++++--
 .../copyPaste/conversion/HalfTheWhiteSpace.expected.kt   | 7 ++++---
 .../copyPaste/conversion/Indentation.expected.kt         | 6 ++++++
 idea/testData/copyPaste/conversion/Indentation.java      | 8 ++++++++
 idea/testData/copyPaste/conversion/Indentation.to.kt     | 2 ++
 .../conversion/SeveralMethodsSample.expected.kt          | 8 ++++----
 .../JavaToKotlinCopyPasteConversionTestGenerated.java    | 5 +++++
 7 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 idea/testData/copyPaste/conversion/Indentation.expected.kt
 create mode 100644 idea/testData/copyPaste/conversion/Indentation.java
 create mode 100644 idea/testData/copyPaste/conversion/Indentation.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 6a15e10796c..571437d73b8 100644
--- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.kt
@@ -31,6 +31,8 @@ import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.plugin.editor.JetEditorOptions
 import java.awt.datatransfer.Transferable
 import com.intellij.openapi.util.TextRange
+import com.intellij.psi.codeStyle.CodeStyleSettings
+import com.intellij.psi.codeStyle.CodeStyleManager
 
 public class JavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBlockTransferableData> {
 
@@ -73,8 +75,11 @@ public class JavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBlockTran
             val text = convertCopiedCodeToKotlin(value, file.getProject())
             if (text.isNotEmpty()) {
                 ApplicationManager.getApplication()!!.runWriteAction {
-                    editor.getDocument().replaceString(bounds!!.getStartOffset(), bounds.getEndOffset(), text)
-                    editor.getCaretModel().moveToOffset(bounds.getStartOffset() + text.length())
+                    val startOffset = bounds!!.getStartOffset()
+                    editor.getDocument().replaceString(bounds.getStartOffset(), bounds.getEndOffset(), text)
+                    val endOffsetAfterCopy = startOffset + text.length()
+                    editor.getCaretModel().moveToOffset(endOffsetAfterCopy)
+                    CodeStyleManager.getInstance(project)!!.reformatText(file, startOffset, endOffsetAfterCopy)
                     PsiDocumentManager.getInstance(file.getProject()).commitDocument(editor.getDocument())
                 }
             }
diff --git a/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
index a496d3889b3..d92740a572c 100644
--- a/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
+++ b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
@@ -1,10 +1,11 @@
 class A {
 
 
-    fun foo() {}
-
-    fun bar() {}
+    fun foo() {
+    }
 
+    fun bar() {
+    }
 
 
     fun f() {}
diff --git a/idea/testData/copyPaste/conversion/Indentation.expected.kt b/idea/testData/copyPaste/conversion/Indentation.expected.kt
new file mode 100644
index 00000000000..b87080b176b
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/Indentation.expected.kt
@@ -0,0 +1,6 @@
+fun main(args: Array<String>) {
+    if (x > 0)
+        x = 2
+    else
+        x = 3
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/Indentation.java b/idea/testData/copyPaste/conversion/Indentation.java
new file mode 100644
index 00000000000..ae5a08318dc
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/Indentation.java
@@ -0,0 +1,8 @@
+class A {
+public static void main(String[]args){
+<selection>if (x > 0)
+x = 2;
+else
+x = 3;</selection>
+}
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/Indentation.to.kt b/idea/testData/copyPaste/conversion/Indentation.to.kt
new file mode 100644
index 00000000000..ec06b7e0cbf
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/Indentation.to.kt
@@ -0,0 +1,2 @@
+fun main(args: Array<String>) { <caret>
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt b/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt
index 16c702bfaf3..5027de905ab 100644
--- a/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt
+++ b/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt
@@ -1,7 +1,7 @@
 class A {
     fun someOther() = false
 
-    private fun formatElement(var element : PsiElement) : String {
+    private fun formatElement(var element: PsiElement): String {
         element = JetPsiUtil.ascendIfPropertyAccessor(element)
         if (element is JetNamedFunction || element is JetProperty)
         {
@@ -18,15 +18,15 @@ class A {
             }
         }
 
-        assert(element is PsiMethod) {"Method accepts only kotlin functions/properties and java methods, but '" + element.getText() + "' was found"}
+        assert(element is PsiMethod) { "Method accepts only kotlin functions/properties and java methods, but '" + element.getText() + "' was found" }
         return JetRefactoringUtil.formatPsiMethod((element as PsiMethod), true, false)
     }
 
-    protected fun getDimensionServiceKey() : String {
+    protected fun getDimensionServiceKey(): String {
         return "#org.jetbrains.jet.plugin.refactoring.safeDelete.KotlinOverridingDialog"
     }
 
-    public fun getSelected() : ArrayList<UsageInfo> {
+    public fun getSelected(): ArrayList<UsageInfo> {
         val result = ArrayList<UsageInfo>()
         for (i in 0..myChecked.length - 1) {
             if (myChecked[i])
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 f6c6bbb0b06..808ca038400 100644
--- a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
@@ -66,6 +66,11 @@ public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaTo
         doTest("idea/testData/copyPaste/conversion/Imports3.java");
     }
     
+    @TestMetadata("Indentation.java")
+    public void testIndentation() throws Exception {
+        doTest("idea/testData/copyPaste/conversion/Indentation.java");
+    }
+    
     @TestMetadata("MethodReferenceWithoutQualifier.java")
     public void testMethodReferenceWithoutQualifier() throws Exception {
         doTest("idea/testData/copyPaste/conversion/MethodReferenceWithoutQualifier.java");