Router: tighten range for parent-ctors policy

scalameta · May 14, 2024 · 6776ba8 · 6776ba8
1 parent 26a244e
commit 6776ba8
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala
@@ -738,21 +738,19 @@ class Router(formatOps: FormatOps) {
             _,
             WithTemplateOnLeft(template),
           ) =>
-        def expire = getTemplateGroups(template)
-          .flatMap(_.last.headOption.flatMap(_.tokens.headOption))
-          .getOrElse(getLastToken(leftOwner))
-        def forceNewlineBeforeExtends = Policy.before(expire) {
-          case Decision(FormatToken(_, soft.ExtendsOrDerives(), m), s)
-              if m.rightOwner.parent.contains(leftOwner) =>
-            s.filter(x => x.isNL && !x.isActiveFor(SplitTag.OnelineWithChain))
-        }
         val policy =
-          if (style.binPack.keepParentConstructors) None
-          else template.tokens.headOption.map { head =>
-            val policyEnd = Policy.End.Before(head)
-            delayedBreakPolicy(policyEnd)(forceNewlineBeforeExtends)
+          if (style.binPack.keepParentConstructors || template.pos.isEmpty)
+            NoPolicy
+          else {
+            val expire = templateDerivesOrCurlyOrLastNonTrivial(template)
+            val forceNewlineBeforeExtends = Policy.before(expire) {
+              case Decision(FormatToken(_, soft.ExtendsOrDerives(), m), s)
+                  if m.rightOwner eq template =>
+                s.filter(x => x.isNL && !x.isActiveFor(SplitTag.OnelineWithChain))
+            }
+            delayedBreakPolicyBefore(expire)(forceNewlineBeforeExtends)
           }
-        Seq(Split(Space, 0).withPolicyOpt(policy))
+        Seq(Split(Space, 0).withPolicy(policy))
       // DefDef
       case FormatToken(_: T.KwDef, _: T.Ident, _) => Seq(Split(Space, 0))
       case FormatToken(_: T.Equals, _, DefValAssignLeft(rhs)) =>