*_mult avoided

test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java

@@ -39,10 +39,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
 
     String actual = "";
     if (javaFile.getParent().endsWith("/expression")) actual = expressionToKotlin(javaCode);
-
-    else if (javaFile.getParent().endsWith("/statement")) actual = statementToSingleLineKotlin(javaCode);
-    else if (javaFile.getParent().endsWith("/statement_mult")) actual = statementToKotlin(javaCode);
-
+    else if (javaFile.getParent().endsWith("/statement")) actual = statementToKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/method")) actual = methodToKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/class")) actual = classToKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/file")) actual = fileToKotlin(javaCode);
@@ -108,14 +105,6 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     return prettify(result);
   }
 
-  protected String methodToSingleLineKotlin(String text) throws IOException {
-    return toSingleLine(methodToKotlin(text));
-  }
-
-  protected String statementToSingleLineKotlin(String code) throws Exception {
-    return toSingleLine(statementToKotlin(code));
-  }
-
   @NotNull
   protected String methodToKotlin(String text) throws IOException {
     String result = classToKotlin("final class C {" + text + "}")
@@ -152,9 +141,4 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
       .trim()
       ;
   }
-
-  @NotNull
-  public static String toSingleLine(String string) {
-    return prettify(string.replaceAll("\n", " "));
-  }
 }

testData/ast/synchronizedStatement/statement/singleLineExample.kt

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