Router: extend SLB after scala.js right paren

scalameta · Sep 23, 2024 · ec6e5eb · ec6e5eb
1 parent ae6bfbc
commit ec6e5eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala
@@ -1269,8 +1269,9 @@ class Router(formatOps: FormatOps) {
               if (!oneline) findComma(ft)
               else if (isSingleArg) None
               else afterFirstArgOneline.map(_.right)
-            val opt = nextComma
-              .getOrElse(scalaJsOptCloseOnRight(beforeClose, flags).right)
+            val opt = nextComma.getOrElse(endOfSingleLineBlock(
+              next(scalaJsOptCloseOnRight(beforeClose, flags)),
+            ))
 
             val slbArg = oneline && !noSplitIndents.exists(_.hasStateColumn)
             val slbPolicy: Policy = (if (slbArg) nextComma else None).map {

diff --git a/scalafmt-tests/shared/src/test/resources/scalajs/Advanced.stat b/scalafmt-tests/shared/src/test/resources/scalajs/Advanced.stat
@@ -27,9 +27,6 @@ newlines.source = keep
 ===
 realeasy && isJavaAtLeast(9) && !perFile.exists(releaseFlag.matches) && toolArgsFor(sources)(ToolName.javaVersion).isEmpty
 >>>
-Idempotency violated
-=> Diff (- obtained, + expected)
--realeasy && isJavaAtLeast(9) && !perFile.exists(
--    releaseFlag.matches) && toolArgsFor(
-+realeasy && isJavaAtLeast(9) && !perFile.exists(releaseFlag.matches) && toolArgsFor(
-     sources)(ToolName.javaVersion).isEmpty
+realeasy && isJavaAtLeast(9) && !perFile.exists(
+    releaseFlag.matches) && toolArgsFor(sources)(ToolName.javaVersion)
+  .isEmpty