FormatOps: refactor the insideBlock method

scalameta · Mar 5, 2020 · 064caab · 064caab
1 parent e66de4a
commit 064caab
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 17 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
@@ -12,6 +12,7 @@ import org.scalafmt.util.LoggerOps.{log, logger}
 
 import scala.annotation.tailrec
 import scala.collection.mutable
+import scala.meta.classifiers.Classifier
 import scala.meta.{
   Case,
   Ctor,
@@ -295,6 +296,23 @@ class FormatOps(val tree: Tree, val initStyle: ScalafmtConfig) {
     else Set.empty[Range]
   }
 
+  def insideBlockRanges[A](start: FormatToken, end: Token)(
+      implicit classifier: Classifier[Token, A]
+  ): Set[Range] =
+    insideBlockRanges(start, end, classifier.apply)
+
+  def insideBlockRanges(
+      start: FormatToken,
+      end: Token,
+      matches: Token => Boolean
+  ): Set[Range] =
+    insideBlock(start, end, matches).map(parensRange)
+
+  def insideBlock[A](start: FormatToken, end: Token)(
+      implicit classifier: Classifier[Token, A]
+  ): Set[Token] =
+    insideBlock(start, end, classifier.apply)
+
   def insideBlock(
       start: FormatToken,
       end: Token,

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala
@@ -669,9 +669,9 @@ class Router(formatOps: FormatOps) {
         // TODO(olafur) DRY. Same logic as in default.
         val exclude =
           if (isBracket)
-            insideBlock(formatToken, close, _.isInstanceOf[T.LeftBracket])
+            insideBlock[T.LeftBracket](formatToken, close)
           else
-            insideBlock(formatToken, close, x => x.isInstanceOf[T.LeftBrace])
+            insideBlock[T.LeftBrace](formatToken, close)
         val excludeRanges = exclude.map(parensRange)
         val unindent =
           UnindentAtExclude(exclude, Num(-style.continuationIndent.callSite))
@@ -721,13 +721,11 @@ class Router(formatOps: FormatOps) {
         val bracketCoef = if (isBracket) Constants.BracketPenalty else 1
 
         val nestedPenalty = nestedApplies(leftOwner) + lhsPenalty
-        val exclude =
-          if (isBracket) insideBlock(tok, close, _.is[T.LeftBracket])
+        val excludeRanges =
+          if (isBracket) insideBlockRanges[T.LeftBracket](tok, close)
           else if (style.activeForEdition_2020_03 && multipleArgs)
-            Set.empty[Token]
-          else
-            insideBlock(tok, close, x => x.is[T.LeftBrace])
-        val excludeRanges = exclude.map(parensRange)
+            Set.empty[Range]
+          else insideBlockRanges[T.LeftBrace](tok, close)
 
         val indent = getApplyIndent(leftOwner)
 
@@ -1084,14 +1082,13 @@ class Router(formatOps: FormatOps) {
           case _ => 0
         }
 
-        val exclude =
-          insideBlock(formatToken, expire, _.isInstanceOf[T.LeftBrace])
         rhs match {
           case t: Term.ApplyInfix =>
             infixSplit(t, formatToken)
           case _ =>
             def twoBranches: Policy = {
-              val excludeRanges = exclude.map(parensRange)
+              val excludeRanges =
+                insideBlockRanges[T.LeftBrace](formatToken, expire)
               penalizeAllNewlines(
                 expire,
                 Constants.ShouldBeSingleLine,
@@ -1321,8 +1318,7 @@ class Router(formatOps: FormatOps) {
           case t: Term.ForYield => t.body.tokens.last
           case t: Term.While => t.body.tokens.last
         }
-        val exclude =
-          insideBlock(formatToken, expire, _.is[T.LeftBrace]).map(parensRange)
+        val exclude = insideBlockRanges[T.LeftBrace](formatToken, expire)
         Seq(
           Split(Space, 0)
             .notIf(isSingleLineComment(formatToken.right) || newlines != 0)
@@ -1342,8 +1338,7 @@ class Router(formatOps: FormatOps) {
         )
       case FormatToken(_, T.KwElse() | T.KwYield(), _) =>
         val expire = rhsOptimalToken(tokens(rightOwner.tokens.last))
-        val exclude =
-          insideBlock(formatToken, expire, _.is[T.LeftBrace]).map(parensRange)
+        val exclude = insideBlockRanges[T.LeftBrace](formatToken, expire)
         Seq(
           Split(Space, 0)
             .onlyIf(newlines == 0)
@@ -1437,8 +1432,7 @@ class Router(formatOps: FormatOps) {
         )
       case tok @ FormatToken(_, cond @ T.KwIf(), _) if rightOwner.is[Case] =>
         val arrow = getCaseArrow(rightOwner.asInstanceOf[Case]).left
-        val exclude =
-          insideBlock(tok, arrow, _.is[T.LeftBrace]).map(parensRange)
+        val exclude = insideBlockRanges[T.LeftBrace](tok, arrow)
         val singleLine = SingleLineBlock(arrow, exclude = exclude)
 
         Seq(