KotlinLikeLangLineIndentProvider: support braces in blocks

Part of #KT-22211
Part of #KT-39353

idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLikeLangLineIndentProvider.kt

@@ -68,6 +68,9 @@ abstract class KotlinLikeLangLineIndentProvider : JavaLikeLangLineIndentProvider
         val before = currentPosition.beforeOptionalMix(*WHITE_SPACE_OR_COMMENT_BIT_SET)
         val after = currentPosition.afterOptionalMix(*WHITE_SPACE_OR_COMMENT_BIT_SET)
         when {
+            before.isAt(BlockOpeningBrace) && after.isAt(BlockClosingBrace) && !currentPosition.hasLineBreaksAfter(offset) ->
+                return factory.createIndentCalculator(Indent.getNoneIndent(), before.startOffset)
+
             after.isAt(Quest) && after.after().isAt(Colon) -> {
                 val indent = if (settings.continuationIndentInElvis)
                     Indent.getContinuationIndent()
@@ -110,10 +113,8 @@ abstract class KotlinLikeLangLineIndentProvider : JavaLikeLangLineIndentProvider
                 }
             }
 
-            before.isAt(LeftParenthesis) && after.isAt(RightParenthesis) -> {
+            before.isAt(LeftParenthesis) && after.isAt(RightParenthesis) ->
-                val indentCalculator = factory.createIndentCalculatorForParenthesis(before, currentPosition, after, offset, settings)
+                factory.createIndentCalculatorForParenthesis(before, currentPosition, after, offset, settings)?.let { return it }
-                if (indentCalculator != null) return indentCalculator
-            }
         }
 
         findFunctionOrPropertyDeclarationBefore(before)?.let {

idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceTypingIndentationTestGenerated.java

@@ -88,6 +88,11 @@ public class PerformanceTypingIndentationTestGenerated extends AbstractPerforman
         runTest("idea/testData/indentationOnNewline/FunctionBlock.kt");
     }
 
+    @TestMetadata("FunctionBlock2.kt")
+    public void testFunctionBlock2() throws Exception {
+        runTest("idea/testData/indentationOnNewline/FunctionBlock2.kt");
+    }
+
     @TestMetadata("InDelegationListAfterColon.kt")
     public void testInDelegationListAfterColon() throws Exception {
         runTest("idea/testData/indentationOnNewline/InDelegationListAfterColon.kt");

idea/testData/indentationOnNewline/FunctionBlock.after.kt

@@ -7,5 +7,3 @@ fun main(args: Array<String>) {
         <caret>
     }
 }
-
-// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/FunctionBlock.kt

@@ -5,5 +5,3 @@ private fun <T> times(times : Int, body : () -> T) {}
 fun main(args: Array<String>) {
     times(3) {<caret>}
 }
-
-// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/FunctionBlock2.after.kt

@@ -0,0 +1,13 @@
+package testing
+
+private fun <T> times(times : Int, body : () -> T) {}
+
+fun main(args: Array<String>) {
+    times(3) {
+
+
+
+
+        <caret>
+    }
+}

idea/testData/indentationOnNewline/FunctionBlock2.kt

@@ -0,0 +1,11 @@
+package testing
+
+private fun <T> times(times : Int, body : () -> T) {}
+
+fun main(args: Array<String>) {
+    times(3) {
+
+
+
+    <caret>}
+}

idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt

@@ -7,5 +7,3 @@ fun test() {
         <caret>
     }
 }
-
-// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.kt

@@ -5,5 +5,3 @@ class Test {
 fun test() {
     val abc = Test().foo()?.foo({ "str" }).foo {<caret>}
 }
-
-// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt

@@ -7,5 +7,3 @@ fun test() {
         <caret>
     }
 }
-
-// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.kt

@@ -5,5 +5,3 @@ class Test {
 fun test() {
     val abc = Test().foo()?.foo({ "str" }).foo { <caret> }
 }
-
-// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt

@@ -9,5 +9,3 @@ fun test() {
                 <caret>
             }
 }
-
-// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.kt

@@ -7,5 +7,3 @@ fun test() {
             .foo { "Str" }
             .foo {<caret>}
 }
-
-// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt

@@ -9,5 +9,3 @@ fun test() {
                 <caret>
             }
 }
-
-// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.kt

@@ -7,5 +7,3 @@ fun test() {
             .foo { "Str" }
             .foo { <caret> }
 }
-
-// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

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

@@ -90,6 +90,11 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
             runTest("idea/testData/indentationOnNewline/FunctionBlock.after.kt");
         }
 
+        @TestMetadata("FunctionBlock2.after.kt")
+        public void testFunctionBlock2() throws Exception {
+            runTest("idea/testData/indentationOnNewline/FunctionBlock2.after.kt");
+        }
+
         @TestMetadata("InDelegationListAfterColon.after.kt")
         public void testInDelegationListAfterColon() throws Exception {
             runTest("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.kt");