From 6b8bd4725d33d703bad3a094003d41778d7f3960 Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:32:04 -0800 Subject: [PATCH] Policy: derive Proxy from WithConv, not Clause --- .../scala/org/scalafmt/internal/Policy.scala | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Policy.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Policy.scala index b4e6046d95..4bda0ed1ba 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Policy.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Policy.scala @@ -348,40 +348,6 @@ object Policy { ): Policy = new Switch(before, trigger, after) } - object Proxy { - def apply(policy: Policy)(factory: Policy => Pf)(implicit - fl: FileLine, - ): Policy = if (policy.isEmpty) NoPolicy else new Proxy(policy, factory) - } - - private class Proxy(policy: Policy, factory: Policy => Pf)(implicit - fl: FileLine, - ) extends Clause { - override val f: Pf = factory(policy) - override def rank: Int = policy.rank - - override def filter(pred: Clause => Boolean): Policy = - if (!pred(this)) NoPolicy else Proxy(policy.filter(pred))(factory) - - override def exists(pred: Clause => Boolean): Boolean = policy.exists(pred) - - override def switch(trigger: T, on: Boolean): Policy = { - val switched = policy.switch(trigger, on) - if (switched eq policy) this else Proxy(switched)(factory) - } - - override def unexpired(split: Split, nextft: FT): Policy = - Proxy(policy.unexpired(split, nextft))(factory) - - override def appliesUntil(nextft: FT)(pred: Clause => Boolean): Boolean = - policy.appliesUntil(nextft)(pred) - - override def noDequeue: Boolean = policy.noDequeue - - override val prefix: String = "*" - override def suffix: String = s"($policy)" - } - final class Map( val noDequeue: Boolean = false, val rank: Int = 0,