Newlines: add a shortcut to check for classic

scalameta · Dec 31, 2024 · d3b1604 · d3b1604
1 parent 72ebee4
commit d3b1604
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Newlines.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Newlines.scala
@@ -255,6 +255,8 @@ case class Newlines(
   @inline
   def keep: Boolean = source eq Newlines.keep
   @inline
+  def classic: Boolean = source eq Newlines.classic
+  @inline
   def keepBreak(hasBreak: => Boolean): Boolean = keep && hasBreak
   @inline
   def keepBreak(newlines: Int): Boolean = keepBreak(!FT.noBreak(newlines))
@@ -349,7 +351,7 @@ case class Newlines(
   def isBeforeOpenParenDefnSite: Boolean = beforeOpenParenDefnSite.isDefined
 
   private[scalafmt] lazy val encloseSelectChains = selectChains.enclose
-    .getOrElse(source.ne(Newlines.classic))
+    .getOrElse(!classic)
 
 }
 

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/State.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/State.scala
@@ -362,8 +362,7 @@ object State {
       new WithComparisons(compareCost, compareDepth, compareLineId)
 
     def get(style: ScalafmtConfig): Ordering[State] =
-      if (style.newlines.source eq Newlines.classic) classicOrdering
-      else compactOrdering
+      if (style.newlines.classic) classicOrdering else compactOrdering
 
     class WithComparisons(comparisons: (State, State) => Int*)
         extends Ordering[State] {