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 7d4c0d5f5..72cfa72c8 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 @@ -97,10 +97,6 @@ class FormatOps( (arguments.toMap, optional.result()) } - class ExtractFromMeta[A](f: FormatToken.Meta => Option[A]) { - def unapply(meta: FormatToken.Meta): Option[A] = f(meta) - } - @inline final def findFirst(start: FormatToken, end: T)( f: FormatToken => Boolean, @@ -319,16 +315,6 @@ class FormatOps( if (r.is[T.LeftBrace]) SplitTag.OneArgPerLine.activateOnly(s) else Decision.onlyNewlineSplits(s) - val WithTemplateOnLeft = new ExtractFromMeta(_.leftOwner match { - case lo: Stat.WithTemplate => Some(lo.templ) - case _ => None - }) - - val TemplateOnRight = new ExtractFromMeta(_.rightOwner match { - case ro: Template => Some(ro) - case _ => None - }) - def templateCurlyFt(template: Template): Option[FormatToken] = getStartOfTemplateBody(template).map(tokenBefore) @@ -862,9 +848,6 @@ class FormatOps( style.newlines.notBeforeImplicitParamListModifier && hasImplicitParamList(formatToken.meta.rightOwner) - val ImplicitUsingOnLeft = - new ExtractFromMeta(meta => getImplicitParamList(meta.leftOwner)) - def isSingleIdentifierAnnotation(tok: FormatToken): Boolean = { val toMatch = if (tok.right.is[T.RightParen]) @@ -2876,4 +2859,21 @@ object FormatOps { ) } + class ExtractFromMeta[A](f: FormatToken.Meta => Option[A]) { + def unapply(meta: FormatToken.Meta): Option[A] = f(meta) + } + + val ImplicitUsingOnLeft = + new ExtractFromMeta(meta => TreeOps.getImplicitParamList(meta.leftOwner)) + + val WithTemplateOnLeft = new ExtractFromMeta(_.leftOwner match { + case lo: Stat.WithTemplate => Some(lo.templ) + case _ => None + }) + + val TemplateOnRight = new ExtractFromMeta(_.rightOwner match { + case ro: Template => Some(ro) + case _ => None + }) + }