From df042383e1f3bbec2d305bf9c127b16445deef43 Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Sat, 23 Nov 2024 07:04:58 -0800 Subject: [PATCH] FormatOps: extract right delims methods --- .../scala/org/scalafmt/internal/FormatOps.scala | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala index 75fdb97b81..24c4617c5a 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala @@ -2814,18 +2814,21 @@ class FormatOps( case _ => Some(xft) } + @inline + def getBeforeRightDelims(ft: FT): FT = + findTokenWith(ft, prev)(xft => noRighDelim(xft.left, xft)).merge + @inline + def getAfterRightDelims(ft: FT): FT = + findTokenWith(ft, next)(xft => noRighDelim(xft.right, xft)).merge + private def policyOnRightDelim( ft: FT, exclude: TokenRanges, ): (Option[FT], Policy) = { - val beforeDelims = findTokenWith(ft, prev) { xft => - noRighDelim(xft.left, xft) - }.merge + val beforeDelims = getBeforeRightDelims(ft) if (beforeDelims eq null) return (None, NoPolicy) - val afterDelims = findTokenWith(ft, next) { xft => - noRighDelim(xft.right, xft) - }.merge + val afterDelims = getAfterRightDelims(ft) if (afterDelims eq null) return (None, NoPolicy) def closeBreakPolicy() = {