FormatOps: consider scalajs tucking in getSlbEnd

scalameta · Sep 25, 2024 · 68bd11b · 68bd11b
1 parent 00453f9
commit 68bd11b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 28 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
@@ -136,13 +136,20 @@ class FormatOps(
       case _: T.LeftBracket => null
       case _: T.Dot if start.rightOwner.is[Type.Select] => null
       case _: T.Ident if start.leftOwner.is[Type.Select] => null
-      case _: T.RightParen => start.left match {
-          case _: T.LeftParen => null
-          case _: T.RightParen
-              if style.newlines.fold ||
-                !style.danglingParentheses.atSite(start.rightOwner, true) =>
-            null
-          case _ => start
+      case t: T.RightParen =>
+        if (start.left.is[T.LeftParen]) null
+        else {
+          val owner = start.rightOwner
+          val isDefnSite = isParamClauseSite(owner)
+          implicit val clauseSiteFlags: ClauseSiteFlags =
+            ClauseSiteFlags(owner, isDefnSite)
+          val bpFlags = getBinpackSiteFlags(tokens(matching(t)), start, false)
+          if (bpFlags.scalaJsStyle) scalaJsOptCloseOnRight(start, bpFlags)
+          else if (
+            !start.left.is[T.RightParen] ||
+            !style.newlines.fold && clauseSiteFlags.dangleCloseDelim
+          ) start
+          else null
         }
       case _: T.Comment =>
         if (start.noBreak) {

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
@@ -1264,9 +1264,8 @@ class Router(formatOps: FormatOps) {
               }.toOption
               else if (isSingleArg) None
               else afterFirstArgOneline.map(_.right)
-            val opt = nextComma.getOrElse(endOfSingleLineBlock(
-              next(scalaJsOptCloseOnRight(beforeClose, flags)),
-            ))
+            val opt = nextComma
+              .getOrElse(endOfSingleLineBlock(next(beforeClose)))
 
             val slbArg = oneline && !noSplitIndents.exists(_.hasStateColumn)
             val slbPolicy: Policy = (if (slbArg) nextComma else None).map {

diff --git a/scalafmt-tests/shared/src/test/resources/default/Apply.stat b/scalafmt-tests/shared/src/test/resources/default/Apply.stat
@@ -648,8 +648,7 @@ SSLConfig(SSLLooseConfig(allowLegacyHelloMessages = None)/*comment 123 comment 2
   val config = WSClientConfig(ssl =
     SSLConfig(
         SSLLooseConfig(allowLegacyHelloMessages =
-          None) /*comment 123 comment 234*/
-    )
+          None) /*comment 123 comment 234*/ )
   ) // comment 345 comment 456
 }
 <<< #1604 1: apply with then without assign, and attached comments, with breaks before paren/comment
@@ -678,10 +677,8 @@ SSLConfig(loose = SSLLooseConfig(allowLegacyHelloMessages = None)/*comment 123 c
 >>>
 {
   val config = WSClientConfig(
-      SSLConfig(loose =
-        SSLLooseConfig(allowLegacyHelloMessages =
-          None) /*comment 123 comment 234*/
-      )
+      SSLConfig(loose = SSLLooseConfig(allowLegacyHelloMessages =
+        None) /*comment 123 comment 234*/ )
   ) // comment 345 comment 456
 }
 <<< #1604 2: apply without then with assign, and attached comments, with breaks before paren/comment
@@ -709,9 +706,10 @@ SSLConfig(loose = SSLLooseConfig(allowLegacyHelloMessages = None)/*comment 123 c
 }
 >>>
 {
-  val config = WSClientConfig(ssl = SSLConfig(loose =
-    SSLLooseConfig(allowLegacyHelloMessages = None) /*comment 123 comment 234*/
-  )) // comment 345 comment 456
+  val config = WSClientConfig(ssl =
+    SSLConfig(loose = SSLLooseConfig(allowLegacyHelloMessages =
+      None) /*comment 123 comment 234*/ )
+  ) // comment 345 comment 456
 }
 <<< #1604 3: apply with assign and attached comments, with breaks before paren/comment
 {

diff --git a/scalafmt-tests/shared/src/test/resources/scalajs/DefDef.stat b/scalafmt-tests/shared/src/test/resources/scalajs/DefDef.stat
@@ -707,8 +707,7 @@ trait EntityPage extends HtmlPage {
                           I(`class` = "clear material-icons",
                               elems = Txt("\uE14C")) ::
                           I(id = "search-icon", `class` = "material-icons",
-                              elems = Txt(
-                                  "\uE8B6"))
+                              elems = Txt("\uE8B6"))
                   )
             ) :: NoElems
     )
@@ -807,9 +806,7 @@ val memberSel: Elems =
                                 placeholder = "Filter all members",
                                 `type` = "text", accesskey = "/")
                       ) ::
-                      I(`class` = "clear material-icons",
-                          elems = Txt(
-                              "\uE14C"))
+                      I(`class` = "clear material-icons", elems = Txt("\uE14C"))
               ) ::
               Div(
                   id = "filterby",
@@ -929,8 +926,7 @@ val memberSel: Elems =
                                                   elems = Txt("Public"))),
                                           Li(`class` = "protected out",
                                               elems = Span(
-                                                  elems = Txt(
-                                                      "Protected")))
+                                                  elems = Txt("Protected")))
                                       ) ++ List(Li(`class` = "private out",
                                               elems = Span(
                                                   elems = Txt("Private"))))

diff --git a/scalafmt-tests/shared/src/test/resources/unit/Lambda.stat b/scalafmt-tests/shared/src/test/resources/unit/Lambda.stat
@@ -95,8 +95,7 @@ Thing(implicit ctx =>
       aaaaaaaaaaaaa(
           bbbbbbbbbbbbbbbbbbb,
           cccccccccc,
-          ddddddddddddddddddddj
-      )) // coooooooooooooooomment
+          ddddddddddddddddddddj)) // coooooooooooooooomment
 <<< long curried with (), with breaks before paren/comment
 Thing(implicit ctx =>
   j =>