BestFirstSearch: state w/ SLB policy isn't best

scalameta · Sep 23, 2024 · b663c2b · b663c2b
1 parent 500d0af
commit b663c2b
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 16 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
@@ -391,6 +391,8 @@ object BestFirstSearch {
     def updateBest(state: State): Boolean =
       (pruneSlowStates ne ScalafmtOptimizer.PruneSlowStates.No) &&
         state.split.isNL &&
+        !state.policy
+          .exists(_.exists(_.isInstanceOf[PolicyOps.SingleLineBlock])) &&
         (best.getOrElseUpdate(state.prev.depth, state) eq state)
 
     def checkExplored(ft: FormatToken)(implicit

diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
@@ -6726,7 +6726,7 @@ def using(@foo @bar('nextStateDate) nextStateData: D): State[S, D] = {
 def using(@foo @bar('nextStateDate) nextStateData: D): State[S, D] = {
   copy(stateData = nextStateData)
 }
-<<< SM 4.7.0: 25
+<<< SM 4.7.0: 25 long
 maxColumn = 80
 ===
 if (
@@ -6737,6 +6737,24 @@ if (
   //
 }
 >>>
+if (
+  settings.fuzzingMode &&
+  !system.settings.config
+    .hasPath("akka.stream.secret-test-fuzzing-warning-disable")
+) {
+  //
+}
+<<< SM 4.7.0: 25 short
+maxColumn = 60
+===
+if (
+  settings.fuzzingMode && !system.settings.config.hasPath(
+    "akka.stream.secret-test-fuzzing-warning-disable"
+  )
+) {
+  //
+}
+>>>
 if (
   settings.fuzzingMode && !system.settings.config.hasPath(
     "akka.stream.secret-test-fuzzing-warning-disable"

diff --git a/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces.stat
@@ -5177,11 +5177,16 @@ object types:
        GCancellable
      ], GAsyncReadyCallback, gpointer, Unit],
      CFuncPtr3[Ptr[GOutputStream], Ptr[GAsyncResult], Ptr[Ptr[GError]], gssize],
-     CFuncPtr7[Ptr[GOutputStream], Ptr[
-       GInputStream
-     ], GOutputStreamSpliceFlags, CInt, Ptr[
-       GCancellable
-     ], GAsyncReadyCallback, gpointer, Unit],
+     CFuncPtr7[
+       Ptr[GOutputStream],
+       Ptr[GInputStream],
+       GOutputStreamSpliceFlags,
+       CInt,
+       Ptr[GCancellable],
+       GAsyncReadyCallback,
+       gpointer,
+       Unit
+     ],
      CFuncPtr3[Ptr[GOutputStream], Ptr[GAsyncResult], Ptr[Ptr[GError]], gssize],
      CFuncPtr5[Ptr[GOutputStream], CInt, Ptr[
        GCancellable

diff --git a/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_fold.stat b/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_fold.stat
@@ -4936,11 +4936,16 @@ object types:
        GCancellable
      ], GAsyncReadyCallback, gpointer, Unit],
      CFuncPtr3[Ptr[GOutputStream], Ptr[GAsyncResult], Ptr[Ptr[GError]], gssize],
-     CFuncPtr7[Ptr[GOutputStream], Ptr[
-       GInputStream
-     ], GOutputStreamSpliceFlags, CInt, Ptr[
-       GCancellable
-     ], GAsyncReadyCallback, gpointer, Unit],
+     CFuncPtr7[
+       Ptr[GOutputStream],
+       Ptr[GInputStream],
+       GOutputStreamSpliceFlags,
+       CInt,
+       Ptr[GCancellable],
+       GAsyncReadyCallback,
+       gpointer,
+       Unit
+     ],
      CFuncPtr3[Ptr[GOutputStream], Ptr[GAsyncResult], Ptr[Ptr[GError]], gssize],
      CFuncPtr5[Ptr[GOutputStream], CInt, Ptr[
        GCancellable

diff --git a/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -5335,11 +5335,16 @@ object types:
        GCancellable
      ], GAsyncReadyCallback, gpointer, Unit],
      CFuncPtr3[Ptr[GOutputStream], Ptr[GAsyncResult], Ptr[Ptr[GError]], gssize],
-     CFuncPtr7[Ptr[GOutputStream], Ptr[
-       GInputStream
-     ], GOutputStreamSpliceFlags, CInt, Ptr[
-       GCancellable
-     ], GAsyncReadyCallback, gpointer, Unit],
+     CFuncPtr7[
+       Ptr[GOutputStream],
+       Ptr[GInputStream],
+       GOutputStreamSpliceFlags,
+       CInt,
+       Ptr[GCancellable],
+       GAsyncReadyCallback,
+       gpointer,
+       Unit
+     ],
      CFuncPtr3[Ptr[GOutputStream], Ptr[GAsyncResult], Ptr[Ptr[GError]], gssize],
      CFuncPtr5[Ptr[GOutputStream], CInt, Ptr[
        GCancellable