FormatOps: slb ends before ) for cfg-style

Author: kitbellew

scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala

@@ -83,7 +83,8 @@ class FormatOps(
           implicit val clauseSiteFlags: ClauseSiteFlags =
             ClauseSiteFlags(owner, isDefnSite)
           val bpFlags = getBinpackSiteFlags(matchingRight(start), start, false)
-          if (bpFlags.scalaJsStyle) scalaJsOptCloseOnRight(start, bpFlags)
+          if (bpFlags.scalaJsStyle)
+            if (start.hasBreak) start else scalaJsOptCloseOnRight(start, bpFlags)
           else if (
             !start.left.is[T.RightParen] ||
             !style.newlines.fold && clauseSiteFlags.dangleCloseDelim

scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatTokens.scala

@@ -76,9 +76,9 @@ class FormatTokens(leftTok2tok: Map[TokenHash, Int])(val arr: Array[FT])
   def next(ft: FT): FT = apply(ft, 1)
 
   @inline
-  private def matching(idx: Int, token: T): FT = matchingParentheses.getOrElse(
+  private def matching(idx: Int, tok: => T): FT = matchingParentheses.getOrElse(
     idx,
-    FormatTokens.throwNoToken(token, "Missing matching token index"),
+    FormatTokens.throwNoToken(tok, "Missing matching token index"),
   )
   @inline
   def matchingLeft(ft: FT): FT = matching(ft.idx, ft.left)

scalafmt-tests-community/intellij/shared/src/test/scala/org/scalafmt/community/intellij/CommunityIntellijScalaSuite.scala

@@ -13,7 +13,7 @@ abstract class CommunityIntellijScalaSuite(name: String)
 class CommunityIntellijScala_2024_2_Suite
     extends CommunityIntellijScalaSuite("intellij-scala-2024.2") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(59389248)
+  override protected def totalStatesVisited: Option[Int] = Some(59389246)
 
   override protected def builds = Seq {
     getBuild(
@@ -54,7 +54,7 @@ class CommunityIntellijScala_2024_2_Suite
 class CommunityIntellijScala_2024_3_Suite
     extends CommunityIntellijScalaSuite("intellij-scala-2024.3") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(59604000)
+  override protected def totalStatesVisited: Option[Int] = Some(59603998)
 
   override protected def builds = Seq {
     getBuild(

scalafmt-tests-community/scala2/shared/src/test/scala/org/scalafmt/community/scala2/CommunityScala2Suite.scala

@@ -18,7 +18,7 @@ class CommunityScala2_12Suite extends CommunityScala2Suite("scala-2.12") {
 
 class CommunityScala2_13Suite extends CommunityScala2Suite("scala-2.13") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(52665901)
+  override protected def totalStatesVisited: Option[Int] = Some(52665895)
 
   override protected def builds =
     Seq(getBuild("v2.13.14", dialects.Scala213, 1287))

scalafmt-tests-community/scala3/shared/src/test/scala/org/scalafmt/community/scala3/CommunityScala3Suite.scala

@@ -9,15 +9,15 @@ abstract class CommunityScala3Suite(name: String)
 
 class CommunityScala3_2Suite extends CommunityScala3Suite("scala-3.2") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(39186562)
+  override protected def totalStatesVisited: Option[Int] = Some(39186514)
 
   override protected def builds = Seq(getBuild("3.2.2", dialects.Scala32, 791))
 
 }
 
 class CommunityScala3_3Suite extends CommunityScala3Suite("scala-3.3") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(42290728)
+  override protected def totalStatesVisited: Option[Int] = Some(42290650)
 
   override protected def builds = Seq(getBuild("3.3.3", dialects.Scala33, 861))
 

scalafmt-tests-community/spark/shared/src/test/scala/org/scalafmt/community/spark/CommunitySparkSuite.scala

@@ -17,7 +17,7 @@ class CommunitySpark3_4Suite extends CommunitySparkSuite("spark-3.4") {
 
 class CommunitySpark3_5Suite extends CommunitySparkSuite("spark-3.5") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(90889210)
+  override protected def totalStatesVisited: Option[Int] = Some(90889168)
 
   override protected def builds = Seq(getBuild("v3.5.3", dialects.Scala213, 2756))
 

scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat

@@ -12380,6 +12380,5 @@ a(A(
 >>>
 a(A(
   b = B,
-  c =
-    C
+  c = C
 ))

scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala

@@ -148,7 +148,7 @@ class FormatTests extends FunSuite with CanRunTests with FormatAssertions {
     val explored = Debug.explored.get()
     logger.debug(s"Total explored: $explored")
     if (!onlyUnit && !onlyManual)
-      assertEquals(explored, 2598230, "total explored")
+      assertEquals(explored, 2598232, "total explored")
     if (!sys.env.contains("CI")) PlatformFileOps.writeFileAsync(
       FileOps.getPath("target", "index.html"),
       Report.heatmap(debugResults.result()),