TreeOps: fix handling implicit group keyword

Earlier, we would only handle the first `implicit` differently if none of the params have an explicit `implicit` keyword. In reality, we should relax the check and do this if not all params have an explicit keyword. The idea being, if they all do, then the initial one belongs to the first parameter rather than the group.
scalameta · Feb 20, 2023 · 8951c58 · 8951c58
1 parent 6168321
commit 8951c58
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 54 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
@@ -638,10 +638,9 @@ object TreeOps {
   def getImplicitParamList(kwOwner: Tree): Option[Seq[Tree]] =
     kwOwner.parent match {
       case Some(Term.ArgClause(v, Some(`kwOwner`))) => Some(v)
-      case Some(Term.ParamClause(v, Some(`kwOwner`))) if (kwOwner match {
-            case _: Mod.Implicit => v.forall(noExplicitImplicit)
-            case _ => true
-          }) =>
+      case Some(Term.ParamClause(v @ head :: rest, Some(`kwOwner`)))
+          if !kwOwner.is[Mod.Implicit] || rest.isEmpty ||
+            !noExplicitImplicit(head) || rest.exists(noExplicitImplicit) =>
         Some(v)
       case _ => None
     }

diff --git a/scalafmt-tests/src/test/resources/default/Class.stat b/scalafmt-tests/src/test/resources/default/Class.stat
@@ -605,7 +605,8 @@ object a {
       implicit c: C,
       implicit d: D) {}
   class F(a: A, as: A*)(b: B, bs: B*)(
-      implicit c: C,
+      implicit
+      c: C,
       d: D,
       implicit e: E) {}
 }
@@ -621,12 +622,14 @@ object a {
 >>>
 object a {
   class F(a: A, as: A*)(b: B, bs: B*)(
-      implicit implicit c: C) {}
+      implicit
+      implicit c: C) {}
   class F(a: A, as: A*)(b: B, bs: B*)(
       implicit c: C,
       implicit d: D) {}
   class F(a: A, as: A*)(b: B, bs: B*)(
-      implicit c: C,
+      implicit
+      c: C,
       d: D,
       implicit e: E) {}
 }
@@ -663,12 +666,14 @@ object a {
 >>>
 object a {
   class F(a: A, as: A*)(b: B, bs: B*)(
-      implicit implicit c: C) {}
+      implicit
+      implicit c: C) {}
   class F(a: A, as: A*)(b: B, bs: B*)(
       implicit c: C,
       implicit d: D) {}
   class F(a: A, as: A*)(b: B, bs: B*)(
-      implicit c: C,
+      implicit
+      c: C,
       d: D,
       implicit e: E) {}
 }
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
@@ -3931,7 +3931,8 @@ object a:
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -3995,7 +3996,8 @@ object a:
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -4024,14 +4026,16 @@ object a:
        c: C
    ): B = ???
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit implicit c: C
+       implicit
+       implicit c: C
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
        implicit c: C,
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -4098,14 +4102,16 @@ object a:
        c: C
    ): B = ???
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit implicit c: C
+       implicit
+       implicit c: C
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
        implicit c: C,
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -4148,7 +4154,8 @@ object a:
        as: A*
      )(b: B,
        bs: B*
-     )(implicit c: C,
+     )(implicit
+       c: C,
        d: D,
        implicit e: E) {}
 <<< interleaved, vertical multiline, implicitParamListModifierPrefer = before
@@ -4234,7 +4241,8 @@ object a:
        as: A*
      )(b: B,
        bs: B*
-     )(implicit c: C,
+     )(implicit
+       c: C,
        d: D,
        implicit e: E) {}
 <<< interleaved, vertical multiline, implicitParamListModifierForce = [after]
@@ -4426,7 +4434,8 @@ object a:
        a: A,
        as: A*
    )(b: B, bs: B*)(
-       implicit implicit c: C
+       implicit
+       implicit c: C
    ) {}
    class F(
        a: A,
@@ -4439,7 +4448,8 @@ object a:
        a: A,
        as: A*
    )(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -4490,6 +4500,7 @@ object a:
        as: A*
      )(b: B,
        bs: B*
-     )(implicit c: C,
+     )(implicit
+       c: C,
        d: D,
        implicit e: E) {}
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat
@@ -3742,7 +3742,8 @@ object a:
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -3806,7 +3807,8 @@ object a:
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -3835,14 +3837,16 @@ object a:
        c: C
    ): B = ???
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit implicit c: C
+       implicit
+       implicit c: C
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
        implicit c: C,
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -3909,14 +3913,16 @@ object a:
        c: C
    ): B = ???
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit implicit c: C
+       implicit
+       implicit c: C
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
        implicit c: C,
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -3959,7 +3965,8 @@ object a:
        as: A*
      )(b: B,
        bs: B*
-     )(implicit c: C,
+     )(implicit
+       c: C,
        d: D,
        implicit e: E) {}
 <<< interleaved, vertical multiline, implicitParamListModifierPrefer = before
@@ -4045,7 +4052,8 @@ object a:
        as: A*
      )(b: B,
        bs: B*
-     )(implicit c: C,
+     )(implicit
+       c: C,
        d: D,
        implicit e: E) {}
 <<< interleaved, vertical multiline, implicitParamListModifierForce = [after]
@@ -4237,7 +4245,8 @@ object a:
        a: A,
        as: A*
    )(b: B, bs: B*)(
-       implicit implicit c: C
+       implicit
+       implicit c: C
    ) {}
    class F(
        a: A,
@@ -4250,7 +4259,8 @@ object a:
        a: A,
        as: A*
    )(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -4301,6 +4311,7 @@ object a:
        as: A*
      )(b: B,
        bs: B*
-     )(implicit c: C,
+     )(implicit
+       c: C,
        d: D,
        implicit e: E) {}
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
@@ -3970,7 +3970,8 @@ object a:
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -4034,7 +4035,8 @@ object a:
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -4063,14 +4065,16 @@ object a:
        c: C
    ): B = ???
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit implicit c: C
+       implicit
+       implicit c: C
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
        implicit c: C,
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -4137,14 +4141,16 @@ object a:
        c: C
    ): B = ???
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit implicit c: C
+       implicit
+       implicit c: C
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
        implicit c: C,
        implicit d: D
    ) {}
    class F(a: A, as: A*)(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -4187,7 +4193,8 @@ object a:
        as: A*
      )(b: B,
        bs: B*
-     )(implicit c: C,
+     )(implicit
+       c: C,
        d: D,
        implicit e: E) {}
 <<< interleaved, vertical multiline, implicitParamListModifierPrefer = before
@@ -4273,7 +4280,8 @@ object a:
        as: A*
      )(b: B,
        bs: B*
-     )(implicit c: C,
+     )(implicit
+       c: C,
        d: D,
        implicit e: E) {}
 <<< interleaved, vertical multiline, implicitParamListModifierForce = [after]
@@ -4468,7 +4476,8 @@ object a:
        a: A,
        as: A*
    )(b: B, bs: B*)(
-       implicit implicit c: C
+       implicit
+       implicit c: C
    ) {}
    class F(
        a: A,
@@ -4481,7 +4490,8 @@ object a:
        a: A,
        as: A*
    )(b: B, bs: B*)(
-       implicit c: C,
+       implicit
+       c: C,
        d: D,
        implicit e: E
    ) {}
@@ -4532,6 +4542,7 @@ object a:
        as: A*
      )(b: B,
        bs: B*
-     )(implicit c: C,
+     )(implicit
+       c: C,
        d: D,
        implicit e: E) {}