Indent () in if, when, while and do-while with continuation indent (KT-5897)

#KT-5897 Fixed

idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt

@@ -368,6 +368,11 @@ private val INDENT_RULES = arrayOf<NodeIndentStrategy>(
                 .`in`(KtNodeTypes.PARENTHESIZED)
                 .set(Indent.getContinuationWithoutFirstIndent(false)),
 
+        strategy("Round Brackets around conditions")
+                .forType(LPAR, RPAR)
+                .`in`(KtNodeTypes.IF, KtNodeTypes.WHEN_ENTRY, KtNodeTypes.WHILE, KtNodeTypes.DO_WHILE)
+                .set(Indent.getContinuationWithoutFirstIndent(true)),
+
         strategy("KDoc comment indent")
                 .`in`(KDOC_CONTENT)
                 .forType(KDocTokens.LEADING_ASTERISK, KDocTokens.END)

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

@@ -0,0 +1,6 @@
+fun test() {
+    if (true &&
+            <caret>)
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.kt

@@ -0,0 +1,6 @@
+fun test() {
+    if (true &&
+            <caret>)
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.kt

@@ -0,0 +1,5 @@
+fun test() {
+    if (true &&<caret>)
+}
+
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION

idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java

@@ -146,6 +146,12 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
             doNewlineTest(fileName);
         }
 
+        @TestMetadata("InBinaryExpressionUnfinishedInIf.after.kt")
+        public void testInBinaryExpressionUnfinishedInIf() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.kt");
+            doNewlineTest(fileName);
+        }
+
         @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.kt")
         public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt");
@@ -374,6 +380,12 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
             doNewlineTestWithInvert(fileName);
         }
 
+        @TestMetadata("InBinaryExpressionUnfinishedInIf.after.inv.kt")
+        public void testInBinaryExpressionUnfinishedInIf() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
+        }
+
         @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt")
         public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt");