Fix formatting for multiline binary expressions

#KT-4797 Fixed

idea/testData/codeInsight/moveUpDown/expressions/insideExpression1.kt

@@ -2,7 +2,7 @@
 fun foo() {
     fun bar1() {}
     val x = 1 +
-    <caret>2 +
-    3
+            <caret>2 +
+            3
     fun bar2() {}
 }

idea/testData/codeInsight/moveUpDown/expressions/insideExpression1.kt.after

@@ -1,8 +1,8 @@
 // MOVE: up
 fun foo() {
     val x = 1 +
-    <caret>2 +
-    3
+            <caret>2 +
+            3
     fun bar1() {}
     fun bar2() {}
 }

idea/testData/codeInsight/moveUpDown/expressions/insideExpression2.kt.after

@@ -3,6 +3,6 @@ fun foo() {
     fun bar1() {}
     fun bar2() {}
     val x = 1 +
-    <caret>2 +
-    3
+            <caret>2 +
+            3
 }

idea/testData/codeInsight/moveUpDown/expressions/insideExpression3.kt

@@ -2,7 +2,7 @@
 fun foo() {
     fun bar1() {}
     val x = 1 +
-    (2 +
-    <caret>3)
+            (2 +
+                    <caret>3)
     fun bar2() {}
 }

idea/testData/codeInsight/moveUpDown/expressions/insideExpression3.kt.after

@@ -1,8 +1,8 @@
 // MOVE: up
 fun foo() {
     val x = 1 +
-    (2 +
-    <caret>3)
+            (2 +
+                    <caret>3)
     fun bar1() {}
     fun bar2() {}
 }

idea/testData/codeInsight/moveUpDown/expressions/insideExpression4.kt.after

@@ -3,6 +3,6 @@ fun foo() {
     fun bar1() {}
     fun bar2() {}
     val x = 1 +
-    (2 +
-    <caret>3)
+            (2 +
+                    <caret>3)
 }

idea/testData/formatter/BinaryExpressions.after.inv.kt

@@ -0,0 +1,15 @@
+fun test() {
+    val somelong = 1 + 2 +
+            3 - 4 -
+            5 * 6 *
+                    7 / 8 /
+                    9 % 10 %
+                    11
+
+    val withBrackets = 3 +
+            4 - (5 +
+            4 * 5)
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// Strage behaviour for disabled alignment is same to Java

idea/testData/formatter/BinaryExpressions.after.kt

@@ -0,0 +1,15 @@
+fun test() {
+    val somelong = 1 + 2 +
+                   3 - 4 -
+                   5 * 6 *
+                   7 / 8 /
+                   9 % 10 %
+                   11
+
+    val withBrackets = 3 +
+                       4 - (5 +
+                            4 * 5)
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// Strage behaviour for disabled alignment is same to Java

idea/testData/formatter/BinaryExpressions.kt

@@ -0,0 +1,15 @@
+fun test() {
+    val somelong = 1 + 2 +
+    3 - 4 -
+    5 * 6 *
+    7 / 8 /
+    9 % 10 %
+    11
+
+    val withBrackets = 3 +
+    4 - (5 +
+    4 * 5)
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// Strage behaviour for disabled alignment is same to Java

idea/testData/formatter/BinaryExpressionsBoolean.after.inv.kt

@@ -0,0 +1,32 @@
+fun test() {
+    if (true
+            || false
+            || true) {
+
+    }
+
+    if (true || false
+            || true) {
+
+    }
+
+    if (true
+            || false
+            || true) {
+
+    }
+
+    if (true ||
+            false ||
+            true) {
+
+    }
+
+    true
+            || true
+
+    false
+            && false
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/formatter/BinaryExpressionsBoolean.after.kt

@@ -0,0 +1,32 @@
+fun test() {
+    if (true
+        || false
+        || true) {
+
+    }
+
+    if (true || false
+        || true) {
+
+    }
+
+    if (true
+        || false
+        || true) {
+
+    }
+
+    if (true ||
+        false ||
+        true) {
+
+    }
+
+    true
+    || true
+
+    false
+    && false
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/formatter/BinaryExpressionsBoolean.kt

@@ -0,0 +1,32 @@
+fun test() {
+    if (true
+    || false
+    || true) {
+
+    }
+
+    if (true || false
+    || true) {
+
+    }
+
+    if (true
+    || false
+    || true) {
+
+    }
+
+    if (true ||
+    false ||
+    true) {
+
+    }
+
+    true
+    || true
+
+    false
+    && false
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt

@@ -0,0 +1,6 @@
+fun some() {
+    val test = 3 +
+            <caret>4
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.kt

@@ -0,0 +1,6 @@
+fun some() {
+    val test = 3 +
+               <caret>4
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.kt

@@ -0,0 +1,5 @@
+fun some() {
+    val test = 3 + <caret>4
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt

@@ -0,0 +1,6 @@
+fun some() {
+    val test = 3 +
+            <caret>
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.kt

@@ -0,0 +1,6 @@
+fun some() {
+    val test = 3 +
+               <caret>
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.kt

@@ -0,0 +1,5 @@
+fun some() {
+    val test = 3 + <caret>
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt

@@ -0,0 +1,4 @@
+val somelong = 3 + 4 - (3 +
+        <caret>)
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt

@@ -0,0 +1,4 @@
+val somelong = 3 + 4 - (3 +
+                       <caret>)
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.kt

@@ -0,0 +1,3 @@
+val somelong = 3 + 4 - (3 + <caret>)
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InExpressionsParentheses.after.inv.kt

@@ -0,0 +1,5 @@
+val somelong = 3 + 4 - (
+        <caret>
+        )
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InExpressionsParentheses.after.kt

@@ -0,0 +1,5 @@
+val somelong = 3 + 4 - (
+                       <caret>
+                       )
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InExpressionsParentheses.kt

@@ -0,0 +1,3 @@
+val somelong = 3 + 4 - (<caret>)
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt

@@ -0,0 +1,4 @@
+val somelong = 3 + (3 *
+        <caret>3)
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt

@@ -0,0 +1,4 @@
+val somelong = 3 + (3 *
+                    <caret>3)
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.kt

@@ -0,0 +1,3 @@
+val somelong = 3 + (3 * <caret>3)
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION