Run formatter in function context for converted expression and statements

j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,8 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.application.Result
+import java.io.BufferedReader
+import java.io.StringReader
 
 public abstract class AbstractJavaToKotlinConverterPluginTest() : AbstractJavaToKotlinConverterTest("ide.kt", PluginSettings)
 public abstract class AbstractJavaToKotlinConverterBasicTest() : AbstractJavaToKotlinConverterTest("kt", TestSettings)
@@ -66,18 +68,32 @@ abstract class AbstractJavaToKotlinConverterTest(
             else -> throw IllegalStateException("Specify what is it: file, class, method, statement or expression " +
                                                 "using the first line of test data file")
         }
-        val actual = reformat(rawConverted, project)
+
+        val reformatInFun = when (prefix) {
+            "element", "expression", "statement" -> true
+            else -> false
+        }
+
+        val actual = reformat(rawConverted, project, reformatInFun)
         val kotlinPath = javaPath.replace(".java", ".$kotlinFileExtension")
         val expectedFile = File(kotlinPath)
         JetTestUtils.assertEqualsToFile(expectedFile, actual)
     }
 
-    private fun reformat(text: String, project: Project): String {
+    private fun reformat(text: String, project: Project, inFunContext: Boolean): String {
-        val convertedFile = JetTestUtils.createFile("converted", text, project)
+        val textToFormat = if (inFunContext) "fun convertedTemp() {\n$text\n}" else text
+
+        val convertedFile = JetTestUtils.createFile("converted", textToFormat, project)
         WriteCommandAction.runWriteCommandAction(project) {
             CodeStyleManager.getInstance(project)!!.reformat(convertedFile)
         }
-        return convertedFile.getText()!!
+
+        val reformattedText = convertedFile.getText()!!
+
+        return if (inFunContext)
+            reformattedText.removeFirstLine().removeLastLine().trimIndent()
+        else
+            reformattedText
     }
 
     private fun elementToKotlin(converter: Converter, text: String): String {
@@ -121,4 +137,42 @@ abstract class AbstractJavaToKotlinConverterTest(
     override fun getProjectJDK(): Sdk? {
         return PluginTestCaseBase.jdkFromIdeaHome()
     }
+
+    private fun String.removeFirstLine(): String {
+        val lastNewLine = indexOf('\n')
+        return if (lastNewLine == -1) "" else substring(lastNewLine)
+    }
+
+    private fun String.removeLastLine(): String {
+        val lastNewLine = lastIndexOf('\n')
+        return if (lastNewLine == -1) "" else substring(0, lastNewLine)
+    }
+
+    private fun String.trimIndent(): String {
+        val lines = split('\n')
+
+        val firstNonEmpty = lines.firstOrNull { !it.trim().isEmpty() }
+        if (firstNonEmpty == null) {
+            return this
+        }
+
+        val trimmedPrefix = firstNonEmpty.takeWhile { ch -> ch.isWhitespace() }
+        if (trimmedPrefix.isEmpty()) {
+            return this
+        }
+
+        return lines.map { line ->
+            if (line.trim().isEmpty()) {
+                ""
+            }
+            else {
+                if (!line.startsWith(trimmedPrefix)) {
+                    throw IllegalArgumentException(
+                            """Invalid line "$line", ${trimmedPrefix.size} whitespace character are expected""")
+                }
+
+                line.substring(trimmedPrefix.length)
+            }
+        }.makeString(separator = "\n")
+    }
 }

j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt

@@ -1 +1 @@
-assert(true) {"string details"}
+assert(true) { "string details" }

j2k/tests/testData/ast/assertStatement/withStringDetail.kt

@@ -1 +1 @@
-assert(true) {"string details"}
+assert(true) { "string details" }

j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.ide.kt

@@ -1,4 +1,4 @@
 (if (a.isEmpty())
-0
+    0
 else
-1)
+    1)

j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.kt

@@ -1,4 +1,4 @@
 (if (a.isEmpty())
-0
+    0
 else
-1)
+    1)

j2k/tests/testData/ast/doWhileStatement/whileWithBlock.ide.kt

@@ -1,6 +1,4 @@
-do
+do {
-{
+    val i = 1
-val i = 1
+    i = i + 1
-i = i + 1
+} while (a > b)
-}
-while (a > b)

j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt

@@ -1,6 +1,4 @@
-do
+do {
-{
+    var i: Int = 1
-var i: Int = 1
+    i = i + 1
-i = i + 1
+} while (a > b)
-}
-while (a > b)

j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt

@@ -1,3 +1,2 @@
-do
+do {
-{}
+} while (true)
-while (true)

j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt

@@ -1,3 +1,2 @@
-do
+do {
-{}
+} while (true)
-while (true)

j2k/tests/testData/ast/doWhileStatement/whileWithExpression.ide.kt

@@ -1,3 +1,3 @@
 do
-i = i + 1
+    i = i + 1
 while (true)

j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt

@@ -1,3 +1,3 @@
 do
-i = i + 1
+    i = i + 1
 while (true)

j2k/tests/testData/ast/doWhileStatement/whileWithReturn.ide.kt

@@ -1,3 +1,3 @@
 do
-return 1
+    return 1
 while (true)

j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt

@@ -1,3 +1,3 @@
 do
-return 1
+    return 1
 while (true)

j2k/tests/testData/ast/for/commonCaseForTest.ide.kt

@@ -1,10 +1,9 @@
 {
-init()
+    init()
-while (condition())
+    while (condition()) {
-{
+        body()
-body()
+        {
-{
+            update()
-update()
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/for/commonCaseForTest.kt

@@ -1,10 +1,9 @@
 {
-init()
+    init()
-while (condition())
+    while (condition()) {
-{
+        body()
-body()
+        {
-{
+            update()
-update()
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/for/forRangeWithLE.ide.kt

@@ -1,4 +1,4 @@
 val array = IntArray(10)
 for (i in 0..10) {
-array[i] = i
+    array[i] = i
 }

j2k/tests/testData/ast/for/forRangeWithLE.kt

@@ -1,4 +1,4 @@
 var array: IntArray? = IntArray(10)
 for (i in 0..10) {
-array[i] = i
+    array[i] = i
 }

j2k/tests/testData/ast/for/forRangeWithLT.ide.kt

@@ -1,4 +1,4 @@
 val array = IntArray(10)
 for (i in 0..10 - 1) {
-array[i] = i
+    array[i] = i
 }

j2k/tests/testData/ast/for/forRangeWithLT.kt

@@ -1,4 +1,4 @@
 var array: IntArray? = IntArray(10)
 for (i in 0..10 - 1) {
-array[i] = i
+    array[i] = i
 }

j2k/tests/testData/ast/for/forWithBlock.ide.kt

@@ -1,4 +1,4 @@
 val array = IntArray(10)
 for (i in 0..10 - 1) {
-array[i] = i
+    array[i] = i
 }

j2k/tests/testData/ast/for/forWithBlock.kt

@@ -1,4 +1,4 @@
 var array: IntArray? = IntArray(10)
 for (i in 0..10 - 1) {
-array[i] = i
+    array[i] = i
 }

j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt

@@ -1,14 +1,13 @@
 {
-val i = 0
+    val i = 0
-while (i <0)
+    while (i < 0) {
-{
+        {
-{
+            val i = 1
-val i = 1
+            i++
-i++
+        }
-}
+        {
-{
+            j++
-j++
+            i++
-i++
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt

@@ -1,14 +1,13 @@
 {
-var i: Int = 0
+    var i: Int = 0
-while (i <0)
+    while (i < 0) {
-{
+        {
-{
+            var i: Int = 1
-var i: Int = 1
+            i++
-i++
+        }
-}
+        {
-{
+            j++
-j++
+            i++
-i++
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt

@@ -1,11 +1,10 @@
 {
-val i = 0
+    val i = 0
-while (i <0)
+    while (i < 0) {
-{
+        { }
-{}
+        {
-{
+            j++
-j++
+            i++
-i++
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/for/forWithEmptyBlock.kt

@@ -1,11 +1,10 @@
 {
-var i: Int = 0
+    var i: Int = 0
-while (i <0)
+    while (i < 0) {
-{
+        { }
-{}
+        {
-{
+            j++
-j++
+            i++
-i++
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/for/forWithNullCondition.ide.kt

@@ -1,10 +1,9 @@
 {
-init()
+    init()
-while (true)
+    while (true) {
-{
+        body()
-body()
+        {
-{
+            update()
-update()
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/for/forWithNullCondition.kt

@@ -1,10 +1,9 @@
 {
-init()
+    init()
-while (true)
+    while (true) {
-{
+        body()
-body()
+        {
-{
+            update()
-update()
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/for/forWithNullInit.ide.kt

@@ -1,9 +1,8 @@
 {
-while (condition())
+    while (condition()) {
-{
+        body()
-body()
+        {
-{
+            update()
-update()
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/for/forWithNullInit.kt

@@ -1,9 +1,8 @@
 {
-while (condition())
+    while (condition()) {
-{
+        body()
-body()
+        {
-{
+            update()
-update()
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/for/forWithNullUpdate.ide.kt

@@ -1,7 +1,6 @@
 {
-init()
+    init()
-while (condition())
+    while (condition()) {
-{
+        body()
-body()
+    }
-}
 }

j2k/tests/testData/ast/for/forWithNullUpdate.kt

@@ -1,7 +1,6 @@
 {
-init()
+    init()
-while (condition())
+    while (condition()) {
-{
+        body()
-body()
+    }
-}
 }

j2k/tests/testData/ast/for/forWithReturn.ide.kt

@@ -1,11 +1,10 @@
 {
-val i = 0
+    val i = 0
-while (i <0)
+    while (i < 0) {
-{
+        return i
-return i
+        {
-{
+            j++
-j++
+            i++
-i++
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/for/forWithReturn.kt

@@ -1,11 +1,10 @@
 {
-var i: Int = 0
+    var i: Int = 0
-while (i <0)
+    while (i < 0) {
-{
+        return i
-return i
+        {
-{
+            j++
-j++
+            i++
-i++
+        }
-}
+    }
-}
 }

j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.ide.kt

@@ -1,5 +1,4 @@
-for (n in list)
+for (n in list) {
-{
+    val i = 1
-val i = 1
+    i++
-i++
 }

j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt

@@ -1,5 +1,4 @@
-for (n in list)
+for (n in list) {
-{
+    var i: Int = 1
-var i: Int = 1
+    i++
-i++
 }

j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt

@@ -1,2 +1,2 @@
-for (n in list)
+for (n in list) {
-{}
+}

j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt

@@ -1,2 +1,2 @@
-for (n in list)
+for (n in list) {
-{}
+}

j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.ide.kt

@@ -1,2 +1,2 @@
 for (n in list)
-i++
+    i++

j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt

@@ -1,2 +1,2 @@
 for (n in list)
-i++
+    i++

j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.ide.kt

@@ -1,2 +1,2 @@
 for (n in list)
-return n
+    return n

j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt

@@ -1,2 +1,2 @@
 for (n in list)
-return n
+    return n

j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt

@@ -1,4 +1,3 @@
-if (1 > 0)
+if (1 > 0) {
-{}
+} else {
-else
+}
-{}

j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt

@@ -1,4 +1,3 @@
-if (1 > 0)
+if (1 > 0) {
-{}
+} else {
-else
+}
-{}

j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.ide.kt

@@ -1,9 +1,6 @@
-if (1 > 0)
+if (1 > 0) {
-{
+    val n = 1
-val n = 1
+    return n
-return n
+} else {
-}
+    return 0
-else
-{
-return 0
 }

j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt

@@ -1,9 +1,6 @@
-if (1 > 0)
+if (1 > 0) {
-{
+    var n: Int = 1
-var n: Int = 1
+    return n
-return n
+} else {
-}
+    return 0
-else
-{
-return 0
 }

j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.ide.kt

@@ -1,4 +1,4 @@
 if (true)
-return 1
+    return 1
 else
-return 0
+    return 0

j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.kt

@@ -1,4 +1,4 @@
 if (true)
-return 1
+    return 1
 else
-return 0
+    return 0

j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.ide.kt

@@ -1,5 +1,4 @@
-if (1 > 0)
+if (1 > 0) {
-{
+    val n = 1
-val n = 1
+    return n
-return n
 }

j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt

@@ -1,5 +1,4 @@
-if (1 > 0)
+if (1 > 0) {
-{
+    var n: Int = 1
-var n: Int = 1
+    return n
-return n
 }

j2k/tests/testData/ast/importStatement/oneImport.java

@@ -1,2 +1,2 @@
-//element
+//file
 import java.util.Arrays;

j2k/tests/testData/ast/importStatement/onlyImports.java

@@ -1,3 +1,3 @@
-//element
+//file
 import java.util.Arrays;
 import java.util.concurrent.ArrayBlockingQueue;

j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt

@@ -1,16 +1,14 @@
 @test for (i in 0..max) {
-val n = substring.length()
+    val n = substring.length()
-val j = i
+    val j = i
-val k = 0
+    val k = 0
-while (n-- != 0)
+    while (n-- != 0) {
-{
+        if (searchMe.charAt(j++) != substring.charAt(k++)) {
-if (searchMe.charAt(j++) != substring.charAt(k++))
+            continue@test
-{
+        }
-continue@test
+    }
-}
+    foundIt = true
-}
+    break@test
-foundIt = true
-break@test
 }
 System.out.println((if (foundIt)
     "Found it"

j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt

@@ -1,16 +1,14 @@
 @test for (i in 0..max) {
-var n: Int = substring.length()
+    var n: Int = substring.length()
-var j: Int = i
+    var j: Int = i
-var k: Int = 0
+    var k: Int = 0
-while (n-- != 0)
+    while (n-- != 0) {
-{
+        if (searchMe.charAt(j++) != substring.charAt(k++)) {
-if (searchMe.charAt(j++) != substring.charAt(k++))
+            continue@test
-{
+        }
-continue@test
+    }
-}
+    foundIt = true
-}
+    break@test
-foundIt = true
-break@test
 }
 System.out?.println((if (foundIt)
     "Found it"

j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt

@@ -1,5 +1,5 @@
 object : Runnable() {
-override fun run() {
+    override fun run() {
-    System.out.println("Run")
+        System.out.println("Run")
-}
+    }
 }

j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt

@@ -1,5 +1,5 @@
 object : Runnable() {
-override fun run() {
+    override fun run() {
-    System.out?.println("Run")
+        System.out?.println("Run")
-}
+    }
 }

j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt

@@ -1,3 +1,3 @@
 val s = null
-if (!s.isEmpty())
+if (!s.isEmpty()) {
-{}
+}

j2k/tests/testData/ast/prefixOperator/nullableIf.kt

@@ -1,3 +1,3 @@
 var s: String? = null
-if (!s?.isEmpty()!!)
+if (!s?.isEmpty()!!) {
-{}
+}

j2k/tests/testData/ast/synchronizedStatement/singleLineExample.ide.kt

@@ -1,3 +1,3 @@
 synchronized (s) {
-doSomething(s)
+    doSomething(s)
 }

j2k/tests/testData/ast/synchronizedStatement/singleLineExample.kt

@@ -1,3 +1,3 @@
 synchronized (s) {
-doSomething(s)
+    doSomething(s)
 }

j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.ide.kt

@@ -1,14 +1,9 @@
-try
+try {
-{
+    callMethod(params)
-callMethod(params)
+} catch (e: Exception) {
-}
+    println(1)
-catch (e : Exception) {
+} catch (e: IOException) {
-println(1)
+    println(0)
-}
+} finally {
-catch (e : IOException) {
+    println(3)
-println(0)
-}
-finally
-{
-println(3)
 }

j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.kt

@@ -1,14 +1,9 @@
-try
+try {
-{
+    callMethod(params)
-callMethod(params)
+} catch (e: Exception) {
-}
+    println(1)
-catch (e : Exception) {
+} catch (e: IOException) {
-println(1)
+    println(0)
-}
+} finally {
-catch (e : IOException) {
+    println(3)
-println(0)
-}
-finally
-{
-println(3)
 }

j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt

@@ -1,10 +1,7 @@
-try
+try {
-{}
+} catch (e: Exception) {
-catch (e : Exception) {
+    println(1)
-println(1)
+} catch (e: IOException) {
-}
+    println(0)
-catch (e : IOException) {
+} finally {
-println(0)
+}
-}
-finally
-{}

j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt

@@ -1,10 +1,7 @@
-try
+try {
-{}
+} catch (e: Exception) {
-catch (e : Exception) {
+    println(1)
-println(1)
+} catch (e: IOException) {
-}
+    println(0)
-catch (e : IOException) {
+} finally {
-println(0)
+}
-}
-finally
-{}

j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt

@@ -1,12 +1,8 @@
-try
+try {
-{}
+} catch (e: Exception) {
-catch (e : Exception) {
+    println(1)
-println(1)
+} catch (e: IOException) {
-}
+    println(0)
-catch (e : IOException) {
+} finally {
-println(0)
+    println(3)
-}
-finally
-{
-println(3)
 }

j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt

@@ -1,12 +1,8 @@
-try
+try {
-{}
+} catch (e: Exception) {
-catch (e : Exception) {
+    println(1)
-println(1)
+} catch (e: IOException) {
-}
+    println(0)
-catch (e : IOException) {
+} finally {
-println(0)
+    println(3)
-}
-finally
-{
-println(3)
 }

j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt

@@ -1,8 +1,6 @@
-try
+try {
-{}
+} catch (e: Exception) {
-catch (e : Exception) {
+    println(1)
-println(1)
+} catch (e: IOException) {
-}
+    println(0)
-catch (e : IOException) {
-println(0)
 }

j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt

@@ -1,8 +1,6 @@
-try
+try {
-{}
+} catch (e: Exception) {
-catch (e : Exception) {
+    println(1)
-println(1)
+} catch (e: IOException) {
-}
+    println(0)
-catch (e : IOException) {
-println(0)
 }

j2k/tests/testData/ast/whileStatement/whileWithBlock.ide.kt

@@ -1,5 +1,4 @@
-while (a > b)
+while (a > b) {
-{
+    val i = 1
-val i = 1
+    i = i + 1
-i = i + 1
 }

j2k/tests/testData/ast/whileStatement/whileWithBlock.kt

@@ -1,5 +1,4 @@
-while (a > b)
+while (a > b) {
-{
+    var i: Int = 1
-var i: Int = 1
+    i = i + 1
-i = i + 1
 }

j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt

@@ -1,2 +1,2 @@
-while (true)
+while (true) {
-{}
+}

j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt

@@ -1,2 +1,2 @@
-while (true)
+while (true) {
-{}
+}

j2k/tests/testData/ast/whileStatement/whileWithExpression.ide.kt

@@ -1,2 +1,2 @@
 while (true)
-i = i + 1
+    i = i + 1

j2k/tests/testData/ast/whileStatement/whileWithExpression.kt

@@ -1,2 +1,2 @@
 while (true)
-i = i + 1
+    i = i + 1

j2k/tests/testData/ast/whileStatement/whileWithReturn.ide.kt

@@ -1,2 +1,2 @@
 while (true)
-return 1
+    return 1

j2k/tests/testData/ast/whileStatement/whileWithReturn.kt

@@ -1,2 +1,2 @@
 while (true)
-return 1
+    return 1