TreeOps: handle trailing-comma case for owners

scalameta · Jan 9, 2024 · 7b9b2ba · 7b9b2ba
1 parent 4c79216
commit 7b9b2ba
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala
@@ -933,6 +933,7 @@ object TreeOps {
           var children = rest
           var prevChild: Tree = null
           var prevLPs = outerPrevLPs
+          var prevComma: Token = null
 
           @tailrec
           def tokenAt(idx: Int): Int = {
@@ -954,6 +955,7 @@ object TreeOps {
                     children = rest
                     nextChildStart = start
                 }
+                prevComma = null
                 tokenAt(nextIdx)
               } else {
                 def excludeRightParen: Boolean = elem match {
@@ -975,12 +977,19 @@ object TreeOps {
                   else {
                     setOwner(tok, prevChild)
                     setOwner(prevParens.head, prevChild)
+                    if (prevComma != null)
+                      setOwner(prevComma, prevChild)
                   }
                   prevLPs -= 1
                   prevParens = prevParens.tail
+                  prevComma = null
+                } else if (tok.is[Comma]) {
+                  prevComma = tok
+                  setOwner(tok, elem)
                 } else {
                   setOwner(tok, elem)
                   if (!tok.is[Trivia] && tokStart != tok.end) {
+                    prevComma = null
                     prevChild = null
                     if (tok.is[LeftParen]) {
                       prevLPs += 1

diff --git a/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasAlways.stat b/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasAlways.stat
@@ -372,7 +372,6 @@ val x = (
  x => x + 1,
 )
 >>>
-Idempotency violated
 val x = (
     x => x + 1,
 )
diff --git a/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasAlwaysDanglingParens.stat b/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasAlwaysDanglingParens.stat
@@ -352,7 +352,6 @@ val x = (
  x => x + 1,
 )
 >>>
-Idempotency violated
 val x = (
     x => x + 1,
 )
diff --git a/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasAlwaysSingleLine.stat b/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasAlwaysSingleLine.stat
@@ -37,5 +37,4 @@ val x = (
  x => x + 1,
 )
 >>>
-Idempotency violated
 val x = (x => x + 1)
diff --git a/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasMultiple.stat b/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasMultiple.stat
@@ -356,7 +356,6 @@ val x = (
  x => x + 1,
 )
 >>>
-Idempotency violated
 val x = (
     x => x + 1
 )
diff --git a/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasMultipleDanglingParens.stat b/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasMultipleDanglingParens.stat
@@ -352,7 +352,6 @@ val x = (
  x => x + 1,
 )
 >>>
-Idempotency violated
 val x = (
     x => x + 1
 )
diff --git a/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasNever.stat b/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasNever.stat
@@ -113,7 +113,6 @@ val x = (
  x => x + 1,
 )
 >>>
-Idempotency violated
 val x = (
     x => x + 1
 )
diff --git a/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasNeverSingleLine.stat b/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasNeverSingleLine.stat
@@ -37,5 +37,4 @@ val x = (
  x => x + 1,
 )
 >>>
-Idempotency violated
 val x = (x => x + 1)
diff --git a/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasPreserve.stat b/scalafmt-tests/src/test/resources/trailing-commas/trailingCommasPreserve.stat
@@ -379,5 +379,5 @@ val x = (
 )
 >>>
 val x = (
-  x => x + 1,
-    )
+    x => x + 1,
+)