FormatWriter: trailing comma with a removed paren

scalameta · Mar 27, 2024 · bb5b96a · bb5b96a
1 parent be33ce0
commit bb5b96a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala
@@ -527,7 +527,12 @@ class FormatWriter(formatOps: FormatOps) {
           style.getTrailingCommas match {
             // remove comma if no newline
             case TrailingCommas.keep
-                if tok.left.is[T.Comma] && isClosedDelimWithNewline(false) =>
+                if tok.left.is[T.Comma] && (isClosedDelimWithNewline(false) ||
+                  (tok.meta.leftOwner match {
+                    // closing paren could have been removed by rewrite
+                    case x: Term.ArgClause => tokens.getLast(x) eq tok
+                    case _ => false
+                  })) =>
               sb.setLength(sb.length - 1)
               if (!tok.right.is[T.RightParen]) ws(1)
               else if (style.spaces.inParentheses) {

diff --git a/scalafmt-tests/src/test/resources/rewrite/RedundantBraces.stat b/scalafmt-tests/src/test/resources/rewrite/RedundantBraces.stat
@@ -1642,17 +1642,10 @@ foo.mtd({
   },
 )
 >>>
-test does not parse: [dialect scala213] end of file expected but , found
 foo.mtd {
   case x => x + 1
   case y => y + 1
- ^
-},
-====== full result: ======
-foo.mtd {
-  case x => x + 1
-  case y => y + 1
-},
+}
 <<< rewrite with trailing commas: partial func, !allowFolding
 rewrite.trailingCommas.style = keep
 rewrite.trailingCommas.allowFolding = false
@@ -1663,17 +1656,10 @@ foo.mtd({
   },
 )
 >>>
-test does not parse: [dialect scala213] end of file expected but , found
 foo.mtd {
   case x => x + 1
   case y => y + 1
- ^
-},
-====== full result: ======
-foo.mtd {
-  case x => x + 1
-  case y => y + 1
-},
+}
 <<< rewrite with trailing commas: match, allowFolding
 rewrite.trailingCommas.style = keep
 rewrite.trailingCommas.allowFolding = true