RewriteTrailingCommas: allow tuples as well

scalameta · Oct 19, 2023 · 829c0e5 · 829c0e5
1 parent a1d3be8
commit 829c0e5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RewriteTrailingCommas.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RewriteTrailingCommas.scala
@@ -42,7 +42,10 @@ private class RewriteTrailingCommas(ftoks: FormatTokens)
 
       // comma and paren/bracket/brace need to have the same owner
       (rightOwner eq nft.meta.rightOwner) && (nft.right match {
-        case _: Token.RightBracket | _: Token.RightParen =>
+        case _: Token.RightParen =>
+          rightOwner.isAny[Member.SyntaxValuesClause, Member.Tuple]
+
+        case _: Token.RightBracket =>
           rightOwner.is[Member.SyntaxValuesClause]
 
         case _: Token.RightBrace =>

diff --git a/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasAlwaysSingleLine.stat b/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasAlwaysSingleLine.stat
@@ -21,6 +21,4 @@ val x = (
   "b",
 )
 >>>
-test does not parse
-val x = ("a", "b", )
-                   ^
+val x = ("a", "b")
diff --git a/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasNeverSingleLine.stat b/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasNeverSingleLine.stat
@@ -21,6 +21,4 @@ val x = (
   "b",
 )
 >>>
-test does not parse
-val x = ("a", "b", )
-                   ^
+val x = ("a", "b")