Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PolicyOps: use relative Policy.XYZ symbols #3349

Merged
merged 1 commit into from
Oct 24, 2022
Merged

PolicyOps: use relative Policy.XYZ symbols #3349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 12 additions & 14 deletions scalafmt-core/shared/src/main/scala/org/scalafmt/util/PolicyOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import scala.meta.tokens.{Token => T}
import org.scalafmt.internal.Decision
import org.scalafmt.internal.Newline
import org.scalafmt.internal.Policy
import org.scalafmt.internal.Policy.End
import org.scalafmt.internal.Policy.Pf
import org.scalafmt.internal.Split
import org.scalafmt.internal.TokenRanges
import org.scalameta.FileLine
Expand All @@ -17,7 +15,7 @@ object PolicyOps {
* do not allow newlines in token syntax
*/
class PenalizeAllNewlines(
val endPolicy: End.WithPos,
val endPolicy: Policy.End.WithPos,
penalty: Int,
penalizeLambdas: Boolean = true,
noSyntaxNL: Boolean = false,
Expand Down Expand Up @@ -56,7 +54,7 @@ object PolicyOps {
* if false, allow newlines in token syntax
*/
class SingleLineBlock(
val endPolicy: End.WithPos,
val endPolicy: Policy.End.WithPos,
okSLC: Boolean = false,
noSyntaxNL: Boolean = false,
val rank: Int = 0
Expand All @@ -80,8 +78,8 @@ object PolicyOps {
okSLC: Boolean = false,
noSyntaxNL: Boolean = false
)(implicit fileLine: FileLine): Policy =
policyWithExclude(exclude, End.On, End.After)(
End.On(expire),
policyWithExclude(exclude, Policy.End.On, Policy.End.After)(
Policy.End.On(expire),
new SingleLineBlock(_, okSLC = okSLC, noSyntaxNL = noSyntaxNL)
)
}
Expand All @@ -92,9 +90,9 @@ object PolicyOps {
val rank: Int = 0
)(implicit fileLine: FileLine)
extends Policy.Clause {
override val endPolicy: End.WithPos = End.On(token)
override val endPolicy: Policy.End.WithPos = Policy.End.On(token)
override val noDequeue: Boolean = false
override val f: Pf = split.fold[Pf] {
override val f: Policy.Pf = split.fold[Policy.Pf] {
{
case d: Decision if d.formatToken.right eq token =>
d.onlyNewlinesWithoutFallback
Expand All @@ -114,9 +112,9 @@ object PolicyOps {
val rank: Int = 0
)(implicit fileLine: FileLine)
extends Policy.Clause {
override val endPolicy: End.WithPos = End.After(token)
override val endPolicy: Policy.End.WithPos = Policy.End.After(token)
override val noDequeue: Boolean = false
override val f: Pf = split.fold[Pf] {
override val f: Policy.Pf = split.fold[Policy.Pf] {
{
case d: Decision if d.formatToken.left eq token =>
d.onlyNewlinesWithoutFallback
Expand All @@ -132,11 +130,11 @@ object PolicyOps {

def policyWithExclude(
exclude: TokenRanges,
endLt: T => End.WithPos,
endRt: T => End.WithPos
endLt: T => Policy.End.WithPos,
endRt: T => Policy.End.WithPos
)(
expire: End.WithPos,
policyFunc: End.WithPos => Policy
expire: Policy.End.WithPos,
policyFunc: Policy.End.WithPos => Policy
)(implicit fileLine: FileLine): Policy = {
val lastPolicy = policyFunc(expire)
exclude.ranges.foldLeft(lastPolicy) { case (policy, range) =>
Expand Down