Split: allow ignoring withOptimalAt, relax check

scalameta · Jun 16, 2024 · 34f0067 · 34f0067
1 parent 2c2c5d9
commit 34f0067
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Split.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Split.scala
@@ -136,21 +136,22 @@ case class Split(
       token: => Token,
       killOnFail: Boolean = false,
       ignore: Boolean = false,
-  ): Split =
-    if (ignore) this else withOptimalAt(Some(OptimalToken(token, killOnFail)))
+  ): Split = withOptimalAt(Some(OptimalToken(token, killOnFail)), ignore)
 
-  def withOptimalAt(fOptimalAt: => Option[OptimalToken]): Split = {
-    require(this.optimalAt.isEmpty)
-    if (isIgnored) this
+  def withOptimalAt(
+      fOptimalAt: => Option[OptimalToken],
+      ignore: Boolean = false,
+  ): Split =
+    if (ignore || isIgnored) this
     else {
       val optimalAt = fOptimalAt
       if (optimalAt.isEmpty) this
       else {
+        require(this.optimalAt.isEmpty)
         require(cost == 0, s"can't set optimal, cost=$cost")
         copy(optimalAt = optimalAt)
       }
     }
-  }
 
   def withPolicy(newPolicy: => Policy, ignore: Boolean = false): Split =
     if (isIgnored || ignore) this