Policy: keep token in Policy.End, not just offset

scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala

@@ -2894,7 +2894,7 @@ class FormatOps(
       def policyWithDelay(policy: Policy) = {
         val beforeDelimsEnd = beforeDelims.right.end
         // force break if multiline and if there's no other break
-        delayedBreakPolicy(Policy.End == beforeDelimsEnd, exclude)(
+        delayedBreakPolicy(Policy.End == beforeDelims.right, exclude)(
           Policy.RelayOnSplit { case (s, nextft) =>
             s.isNL && nextft.right.end > beforeDelimsEnd // don't need anymore
           }(policy, NoPolicy),

scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Policy.scala

@@ -416,40 +416,34 @@ object Policy {
   }
 
   sealed trait End extends (Token => End.WithPos) {
-    def apply(endPos: Int): End.WithPos
-    final def apply(token: Token): End.WithPos = apply(token.end)
+    def apply(token: Token): End.WithPos
   }
   object End {
-    def <(endPos: Int): End.WithPos = Before(endPos)
-    def <(token: Token): End.WithPos = this < token.end
-
-    def >(endPos: Int): End.WithPos = After(endPos)
-    def >(token: Token): End.WithPos = this > token.end
-
-    def ==(endPos: Int): End.WithPos = On(endPos)
-    def ==(token: Token): End.WithPos = this == token.end
+    def <(token: Token): End.WithPos = Before(token)
+    def >(token: Token): End.WithPos = After(token)
+    def ==(token: Token): End.WithPos = On(token)
 
     sealed trait WithPos {
       def notExpiredBy(ft: FormatToken): Boolean
       def ==>(policy: Policy): Policy =
         if (policy.isEmpty) NoPolicy else new Policy.Delay(policy, this)
     }
     case object After extends End {
-      def apply(endPos: Int): WithPos = new End.WithPos {
-        def notExpiredBy(ft: FormatToken): Boolean = ft.left.end <= endPos
-        override def toString: String = s">$endPos"
+      def apply(token: Token): WithPos = new End.WithPos {
+        def notExpiredBy(ft: FormatToken): Boolean = ft.left.end <= token.end
+        override def toString: String = s">${token.structure}"
       }
     }
     case object Before extends End {
-      def apply(endPos: Int): WithPos = new End.WithPos {
-        def notExpiredBy(ft: FormatToken): Boolean = ft.right.end < endPos
-        override def toString: String = s"<$endPos"
+      def apply(token: Token): WithPos = new End.WithPos {
+        def notExpiredBy(ft: FormatToken): Boolean = ft.right.end < token.end
+        override def toString: String = s"<${token.structure}"
       }
     }
     case object On extends End {
-      def apply(endPos: Int): WithPos = new End.WithPos {
-        def notExpiredBy(ft: FormatToken): Boolean = ft.right.end <= endPos
-        override def toString: String = s"@$endPos"
+      def apply(token: Token): WithPos = new End.WithPos {
+        def notExpiredBy(ft: FormatToken): Boolean = ft.right.end <= token.end
+        override def toString: String = s"@${token.structure}"
       }
     }
   }