Reformat: BranchedFoldingUtils

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedFoldingUtils.kt

@@ -61,18 +61,15 @@ object BranchedFoldingUtils {
         fun collectAssignmentsAndCheck(e: KtExpression?): Boolean = when (e) {
             is KtWhenExpression -> {
                 val entries = e.entries
-                !e.hasMissingCases() &&
+                !e.hasMissingCases() && entries.isNotEmpty() && entries.all { entry ->
-                entries.isNotEmpty() &&
-                entries.all { entry ->
                     val assignment = getFoldableBranchedAssignment(entry.expression)?.run { assignments.add(this) }
                     assignment != null || collectAssignmentsAndCheck(entry.expression?.lastBlockStatementOrThis())
                 }
             }
             is KtIfExpression -> {
                 val branches = e.branches
-                branches.size > 1 &&
+                val elseBranch = branches.lastOrNull()?.getStrictParentOfType<KtIfExpression>()?.`else`
-                (branches.lastOrNull()?.getStrictParentOfType<KtIfExpression>()?.`else` != null) &&
+                branches.size > 1 && elseBranch != null && branches.all { branch ->
-                branches.all { branch ->
                     val assignment = getFoldableBranchedAssignment(branch)?.run { assignments.add(this) }
                     assignment != null || collectAssignmentsAndCheck(branch?.lastBlockStatementOrThis())
                 }
@@ -105,7 +102,8 @@ object BranchedFoldingUtils {
                     else
                         false
                 }
-        )) {
+            )
+        ) {
             return -1
         }
         return assignments.size
@@ -117,8 +115,7 @@ object BranchedFoldingUtils {
             val foldableBranchedReturn = getFoldableBranchedReturn(branch)
             if (foldableBranchedReturn != null) {
                 prevList.add(foldableBranchedReturn)
-                }
+            } else {
-                else {
                 val currReturns = getFoldableReturns(branch?.lastBlockStatementOrThis()) ?: return@fold null
                 prevList += currReturns
             }
@@ -175,6 +172,7 @@ object BranchedFoldingUtils {
                 replace(rhs)
             }
         }
+
         fun lift(e: KtExpression?) {
             when (e) {
                 is KtWhenExpression -> e.entries.forEach { entry ->
@@ -196,19 +194,18 @@ object BranchedFoldingUtils {
         fun KtReturnExpression.replaceWithReturned() {
             replace(returnedExpression!!)
         }
+
         fun lift(e: KtExpression?) {
             when (e) {
                 is KtWhenExpression -> e.entries.forEach { entry ->
-                    getFoldableBranchedReturn(entry.expression)?.replaceWithReturned()
+                    val entryExpr = entry.expression
-                    ?: lift(entry.expression?.lastBlockStatementOrThis())
+                    getFoldableBranchedReturn(entryExpr)?.replaceWithReturned() ?: lift(entryExpr?.lastBlockStatementOrThis())
                 }
                 is KtIfExpression -> e.branches.forEach { branch ->
-                    getFoldableBranchedReturn(branch)?.replaceWithReturned() ?:
+                    getFoldableBranchedReturn(branch)?.replaceWithReturned() ?: lift(branch?.lastBlockStatementOrThis())
-                    lift(branch?.lastBlockStatementOrThis())
                 }
                 is KtTryExpression -> e.tryBlockAndCatchBodies().forEach {
-                    getFoldableBranchedReturn(it)?.replaceWithReturned() ?:
+                    getFoldableBranchedReturn(it)?.replaceWithReturned() ?: lift(it?.lastBlockStatementOrThis())
-                    lift(it?.lastBlockStatementOrThis())
                 }
             }
         }