RewriteTrailingCommas: take over check, refactor

scalameta · Mar 27, 2024 · 7f967a1 · 7f967a1
1 parent 08f0a19
commit 7f967a1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantParens.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantParens.scala
@@ -88,15 +88,10 @@ class RedundantParens(implicit val ftoks: FormatTokens)
       session: Session,
       style: ScalafmtConfig
   ): Option[(Replacement, Replacement)] =
-    ft.right match {
-      case _: Token.RightParen if left.isRemove && {
-            val maybeCommaFt = ftoks.prevNonComment(ft)
-            !maybeCommaFt.left.is[Token.Comma] ||
-            session.isRemovedOnLeft(maybeCommaFt, true)
-          } /* check for trailing comma */ =>
-        Some((left, removeToken))
-      case _ => None
-    }
+    if (left.isRemove && RewriteTrailingCommas.checkIfPrevious)
+      Some((left, removeToken))
+    else
+      None
 
   private def okToReplaceWithCount(numParens: Int, tree: Tree)(implicit
       style: ScalafmtConfig

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
@@ -10,13 +10,28 @@ import org.scalafmt.internal.FormatTokens
 
 object RewriteTrailingCommas extends FormatTokensRewrite.RuleFactory {
 
+  import FormatTokensRewrite._
+
   override def enabled(implicit style: ScalafmtConfig): Boolean =
     style.dialect.allowTrailingCommas &&
       style.getTrailingCommas.ne(TrailingCommas.keep)
 
   override def create(implicit ftoks: FormatTokens): FormatTokensRewrite.Rule =
     new RewriteTrailingCommas
 
+  private[rewrite] def checkIfPrevious(implicit
+      ft: FormatToken,
+      session: Session,
+      ftoks: FormatTokens
+  ): Boolean =
+    ft.right match {
+      case _: Token.RightParen =>
+        val maybeCommaFt = ftoks.prevNonComment(ft)
+        !maybeCommaFt.left.is[Token.Comma] ||
+        session.isRemovedOnLeft(maybeCommaFt, true)
+      case _ => true
+    }
+
 }
 
 private class RewriteTrailingCommas(implicit val ftoks: FormatTokens)
@@ -37,9 +52,15 @@ private class RewriteTrailingCommas(implicit val ftoks: FormatTokens)
       session: Session,
       style: ScalafmtConfig
   ): Option[Replacement] = {
-    val ok = ft.right.is[Token.Comma] && {
+    if (shouldRemove(ft)) Some(removeToken) else None
+  }
+
+  private[rewrite] def shouldRemove(
+      ft: FormatToken
+  )(implicit session: Session): Boolean = {
+    ft.right.is[Token.Comma] && {
       val rightOwner = ft.meta.rightOwner
-      val nft = ftoks.nextNonComment(ftoks.next(ft))
+      val nft = ftoks.nextNonCommentAfter(ft)
 
       // comma and paren/bracket/brace need to have the same owner
       (rightOwner eq nft.meta.rightOwner) && (nft.right match {
@@ -59,7 +80,6 @@ private class RewriteTrailingCommas(implicit val ftoks: FormatTokens)
         case _ => false
       })
     }
-    if (ok) Some(removeToken) else None
   }
 
   override def onRight(lt: Replacement, hasFormatOff: Boolean)(implicit