TreeExtractors: use Type.Apply in Type.With chain

scalameta · Dec 23, 2021 · 8f8267e · 8f8267e
1 parent f8b309f
commit 8f8267e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeExtractors.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeExtractors.scala
@@ -71,7 +71,8 @@ object WithChain {
     // self types, params, val/def/var/type definitions or declarations
     val top = TreeOps.topTypeWith(t)
     top.parent match {
-      case Some(_: Defn | _: Decl | _: Term.Param | _: Self) => Some(top)
+      case Some(_: Defn | _: Decl | _: Term.Param | _: Self | _: Type.Apply) =>
+        Some(top)
       case _ => None
     }
   }

diff --git a/scalafmt-tests/src/test/resources/binPack/ParentConstructors.stat b/scalafmt-tests/src/test/resources/binPack/ParentConstructors.stat
@@ -75,7 +75,9 @@ DTDataset[
   ]
 >>>
 def method[T <: ColType](): DTDataset[
-  T with ACol with BCol with CCol with DCol with ECol with FCol with GCol with HCol with ICol
+  T with ACol with BCol with CCol
+    with DCol with ECol with FCol
+    with GCol with HCol with ICol
 ]
 <<< #2977 binpack never
 binPack.parentConstructors = never
@@ -87,7 +89,15 @@ DTDataset[
   ]
 >>>
 def method[T <: ColType](): DTDataset[
-  T with ACol with BCol with CCol with DCol with ECol with FCol with GCol with HCol with ICol
+  T with ACol
+    with BCol
+    with CCol
+    with DCol
+    with ECol
+    with FCol
+    with GCol
+    with HCol
+    with ICol
 ]
 <<< #2977 binpack keep
 binPack.parentConstructors = keep
@@ -99,5 +109,8 @@ DTDataset[
   ]
 >>>
 def method[T <: ColType](): DTDataset[
-  T with ACol with BCol with CCol with DCol with ECol with FCol with GCol with HCol with ICol
+  T with ACol with BCol with CCol
+    with DCol with ECol
+    with FCol with GCol with HCol
+    with ICol
 ]
diff --git a/scalafmt-tests/src/test/resources/default/TypeWith.stat b/scalafmt-tests/src/test/resources/default/TypeWith.stat
@@ -6,8 +6,8 @@
 >>>
 {
   def getAnnotationOwner(
-      annotationOwnerLookUp: ScLiteral => Option[
-          PsiAnnotationOwner with PsiElement]): Option[PsiAnnotationOwner] = 1
+      annotationOwnerLookUp: ScLiteral => Option[PsiAnnotationOwner
+        with PsiElement]): Option[PsiAnnotationOwner] = 1
 }
 <<< #1133
 indent.main = 4