BestFirstSearch: fix bug, possible infinite loop

scalameta · Sep 20, 2024 · 4022f2f · 4022f2f
1 parent 7b98a6c
commit 4022f2f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/BestFirstSearch.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/BestFirstSearch.scala
@@ -280,15 +280,16 @@ private class BestFirstSearch private (range: Set[Range])(implicit
     case Seq(split) if !split.isNL =>
       style.runner.event(FormatEvent.Enqueue(split))
       val nextState = state.next(split, nextAllAltAreNL = false)
-      if (nextState.split.cost > 0 || nextState.depth >= tokens.length) state
+      if (nextState.split.cost > 0) state
+      else if (nextState.depth >= tokens.length) nextState
       else {
         val nextToken = tokens(nextState.depth)
         if (RightParenOrBracket(nextToken.right)) {
           implicit val style: ScalafmtConfig = styleMap.at(nextToken)
           trackState(nextState, depth, 0)
-          val nextSplits = getActiveSplits(nextToken, state, maxCost = 0)
+          val nextSplits = getActiveSplits(nextToken, nextState, maxCost = 0)
           traverseSameLineZeroCost(nextSplits, nextState, depth)
-        } else state
+        } else nextState
       }
     case _ => state
   }