FormatOps: use optimal slb end in binpacked (...

scalameta · Oct 2, 2024 · df38625 · df38625
1 parent 860c1b9
commit df38625
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala
@@ -1057,9 +1057,10 @@ class FormatOps(
       }
       val noSyntaxNL = extendsThenWith
       val pnlPolicy = PenalizeAllNewlines(lastToken, 1, noSyntaxNL = noSyntaxNL)
+      val slbEnd = endOfSingleLineBlock(lastFt)
       Seq(
         Split(Space, 0)
-          .withSingleLine(lastToken, exclude = exclude, noSyntaxNL = noSyntaxNL)
+          .withSingleLine(slbEnd, exclude = exclude, noSyntaxNL = noSyntaxNL)
           .orPolicy(pnlPolicy).withIndent(indent),
         Split(nlMod, 0).onlyIf(nlOnelineTag != Right(false))
           .preActivateFor(nlOnelineTag.left.toOption)

diff --git a/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces.stat
@@ -7340,6 +7340,5 @@ object Parsers:
 >>>
 object Parsers:
    enum Location(inArgs: Boolean):
-      case InPatternArgs
-          extends Location(false, true,
+      case InPatternArgs extends Location(false, true,
             true) // InParens not true, since it might be an alternative
diff --git a/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_fold.stat b/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_fold.stat
@@ -7060,7 +7060,6 @@ object Parsers:
 >>>
 object Parsers:
    enum Location(inArgs: Boolean):
-      case InPatternArgs
-          extends Location(
+      case InPatternArgs extends Location(
             false, true, true
           ) // InParens not true, since it might be an alternative
diff --git a/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_keep.stat b/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_keep.stat
@@ -7371,6 +7371,5 @@ object Parsers:
 >>>
 object Parsers:
    enum Location(inArgs: Boolean):
-      case InPatternArgs
-          extends Location(false, true,
+      case InPatternArgs extends Location(false, true,
             true) // InParens not true, since it might be an alternative
diff --git a/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -7631,7 +7631,6 @@ object Parsers:
 >>>
 object Parsers:
    enum Location(inArgs: Boolean):
-      case InPatternArgs
-          extends Location(
+      case InPatternArgs extends Location(
             false, true, true
           ) // InParens not true, since it might be an alternative
diff --git a/scalafmt-tests/shared/src/test/resources/unit/Comment.stat b/scalafmt-tests/shared/src/test/resources/unit/Comment.stat
@@ -219,7 +219,8 @@ object literal extends scala.Dynamic { // scalastyle:ignore
     ???
 }
 >>>
-object literal extends scala.Dynamic { // scalastyle:ignore
+object literal
+    extends scala.Dynamic { // scalastyle:ignore
   ???
 }
 <<< #1234 1: single-line