[formatter] More workarounds for assignment

Author: AbdullinAM

core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt

@@ -1427,11 +1427,18 @@ open class KotlinInputAstVisitor(
     builder.sync(expression)
     val op = expression.operationToken
 
-    if (KtTokens.ALL_ASSIGNMENTS.contains(op) && expression.right.isLambdaOrScopingFunction) {
+    val right = expression.right
+    if (
+        KtTokens.ALL_ASSIGNMENTS.contains(op) &&
+            right != null &&
+            (!forceLineBreakAfterAssignment || right.isLambdaOrScopingFunction)
+    ) {
       // Assignments are statements in Kotlin; we don't have to worry about compound assignment.
       visit(expression.left)
       builder.spaceThenToken(expression.operationReference.text)
-      visitLambdaOrScopingFunction(expression.right)
+      // The level keeps the break after the operator out of reach of any forced break the
+      // left-hand side brought with it -- an annotation before the statement, say.
+      builder.block(ZERO) { emitAssignedExpression(right) }
       return
     }
 
@@ -1737,15 +1744,23 @@ open class KotlinInputAstVisitor(
    */
   private fun emitInitializer(initializer: KtExpression) {
     builder.spaceThenToken("=")
-    if (emitExpressionAfterOperator(initializer)) {
+    emitAssignedExpression(initializer)
+  }
+
+  /**
+   * Lays out the right-hand side of an assignment operator -- the `=` of an initializer or of an
+   * assignment statement -- according to the kind of expression it is.
+   */
+  private fun emitAssignedExpression(expression: KtExpression) {
+    if (emitExpressionAfterOperator(expression)) {
       return
     }
     // A chain gets to keep its receiver on the `=` line when it fits there; everything else
     // breaks after the `=` and is laid out one level in.
-    if (!emitChainAfterOperator(initializer)) {
+    if (!emitChainAfterOperator(expression)) {
       builder.breakOpThenBlock(" ", expressionBreakIndent) {
         builder.fenceComments()
-        visit(initializer)
+        visit(expression)
       }
     }
   }

core/src/test/resources/cases/new_codestyle/AssignmentStatement.input

@@ -0,0 +1,47 @@
+fun singleCallChain() {
+    reports {
+        total {
+            html {
+                report {
+                    htmlDir = conventionProject.layout.buildDirectory.dir("kover/${project.name}/html")
+                }
+            }
+        }
+    }
+}
+
+fun splittableChain() {
+    reports {
+        total {
+            html {
+                htmlDir = conventionProject.layout.buildDirectory.dir("kover/html").asFile.absolutePath
+            }
+        }
+    }
+}
+
+fun annotatedAssignment() {
+    var b
+    @Suppress("UNCHECKED_CAST") b = f(1) as Int
+    @Suppress("UNCHECKED_CAST")
+    b = f(1) as Int
+}
+
+fun whenAssignment() {
+    reports {
+        total {
+            htmlDirectoryValue = when (someLongConditionValue) {
+                1 -> firstValue
+                else -> secondValue
+            }
+        }
+    }
+}
+
+fun scopingFunctionAssignment() {
+    reports {
+        total {
+            htmlDirectoryValue = conventionProjectValue.apply { someLongName = otherLongName }
+        }
+    }
+}

core/src/test/resources/cases/new_codestyle/AssignmentStatement.new.output

@@ -0,0 +1,51 @@
+fun singleCallChain() {
+    reports {
+        total {
+            html {
+                report {
+                    htmlDir =
+                        conventionProject.layout.buildDirectory.dir("kover/${project.name}/html")
+                }
+            }
+        }
+    }
+}
+
+fun splittableChain() {
+    reports {
+        total {
+            html {
+                htmlDir = conventionProject.layout.buildDirectory
+                    .dir("kover/html")
+                    .asFile
+                    .absolutePath
+            }
+        }
+    }
+}
+
+fun annotatedAssignment() {
+    var b
+    @Suppress("UNCHECKED_CAST") b = f(1) as Int
+    @Suppress("UNCHECKED_CAST")
+    b = f(1) as Int
+}
+
+fun whenAssignment() {
+    reports {
+        total {
+            htmlDirectoryValue = when (someLongConditionValue) {
+                1 -> firstValue
+                else -> secondValue
+            }
+        }
+    }
+}
+
+fun scopingFunctionAssignment() {
+    reports {
+        total {
+            htmlDirectoryValue = conventionProjectValue.apply { someLongName = otherLongName }
+        }
+    }
+}

core/src/test/resources/cases/new_codestyle/AssignmentStatement.output

@@ -0,0 +1,48 @@
+fun singleCallChain() {
+  reports {
+    total {
+      html {
+        report {
+          htmlDir = conventionProject.layout.buildDirectory.dir("kover/${project.name}/html")
+        }
+      }
+    }
+  }
+}
+
+fun splittableChain() {
+  reports {
+    total {
+      html {
+        htmlDir = conventionProject.layout.buildDirectory.dir("kover/html").asFile.absolutePath
+      }
+    }
+  }
+}
+
+fun annotatedAssignment() {
+  var b
+  @Suppress("UNCHECKED_CAST") b = f(1) as Int
+  @Suppress("UNCHECKED_CAST")
+  b = f(1) as Int
+}
+
+fun whenAssignment() {
+  reports {
+    total {
+      htmlDirectoryValue =
+          when (someLongConditionValue) {
+            1 -> firstValue
+            else -> secondValue
+          }
+    }
+  }
+}
+
+fun scopingFunctionAssignment() {
+  reports {
+    total {
+      htmlDirectoryValue = conventionProjectValue.apply { someLongName = otherLongName }
+    }
+  }
+}

core/src/test/resources/cases/new_codestyle/Foo.input

@@ -0,0 +1,12 @@
+fun foo() {
+extensions.configure<KoverProjectExtension>("kover") {
+        reports {
+            total {
+                html {
+                    htmlDir =
+                        conventionProject.layout.buildDirectory.dir("kover/${project.name}/html")
+                }
+            }
+        }
+    }
+    }

core/src/test/resources/cases/new_codestyle/Foo.new.output

@@ -0,0 +1,12 @@
+fun foo() {
+    extensions.configure<KoverProjectExtension>("kover") {
+        reports {
+            total {
+                html {
+                    htmlDir =
+                        conventionProject.layout.buildDirectory.dir("kover/${project.name}/html")
+                }
+            }
+        }
+    }
+}

core/src/test/resources/cases/new_codestyle/Foo.output

@@ -0,0 +1,11 @@
+fun foo() {
+  extensions.configure<KoverProjectExtension>("kover") {
+    reports {
+      total {
+        html {
+          htmlDir = conventionProject.layout.buildDirectory.dir("kover/${project.name}/html")
+        }
+      }
+    }
+  }
+}