From c1ed2e020c6ef76ccc8331eaaa11d64f54f83fb9 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Tue, 12 Mar 2019 12:21:12 +0300
Subject: [PATCH] New J2K: Fix formatting saving

---
 nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt | 3 ++-
 nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt
index cf88751ff06..ff15215d025 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt
@@ -39,8 +39,9 @@ object ConversionsRunner {
             +AssignmentStatementSimplifyValConversion()
             +AssignmentStatementSimplifyAlsoConversion()
             +AssignmentStatementSplitAlsoConversion()
-            +PolyadicExpressionConversion(context)
+            +PolyadicExpressionConversion()
             +OperatorExpressionConversion(context)
+            +AddParenthesisForLineBreaksInBinaryExpression()
             +ThrowStatementConversion()
             +ArrayInitializerConversion(context)
             +TryStatementConversion(context)
diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt
index 15cae2d2e82..e500ddaf25c 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt
@@ -55,7 +55,7 @@ class NewCodeBuilder {
         private fun List<JKNonCodeElement>.createText(): String {
             val text = joinToString("") { token -> token.createText() }
             val needNewLine = text.lastIndexOf('\n') < text.lastIndexOf("//")
-            return text +"\n".takeIf { needNewLine }.orEmpty()
+            return text + "\n".takeIf { needNewLine }.orEmpty()
         }
 
         private fun JKNonCodeElementsListOwner.needPreserveSpacesAfterLastCommit() =