BestFirstSearch: try memorize partial functions

scalameta · Oct 29, 2024 · a0a013d · a0a013d
1 parent 9aa37cc
commit a0a013d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 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
@@ -319,6 +319,8 @@ object BestFirstSearch {
     var expire: FormatToken = null
     @inline
     def addRange(t: Token): Unit = expire = tokens.matching(t)
+    @inline
+    def addBlock(t: Token): Unit = result.getOrElseUpdate(t, false)
     tokens.foreach {
       case ft if expire ne null =>
         if (ft eq expire) expire = null else result.update(ft.left, true)
@@ -332,6 +334,8 @@ object BestFirstSearch {
           // Type compounds can be inside defn.defs
           case lo: meta.Stat.Block if lo.parent.is[Type.Refine] => addRange(t)
           case _: Type.Refine => addRange(t)
+          case _: Term.PartialFunction if styleMap.at(t).newlines.fold =>
+            addBlock(t)
           case _ =>
         }
       case _ =>

diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
@@ -9460,7 +9460,7 @@ object a {
         }
   }
 }
->>> { stateVisits = 2428, stateVisits2 = 2428 }
+>>> { stateVisits = 8595, stateVisits2 = 8595 }
 object a {
   private object MemoMap {
     def make(implicit trace: Trace): UIO[MemoMap] = Ref.Synchronized
@@ -10059,7 +10059,6 @@ object a {
 preset = default
 maxColumn = 80
 newlines.source = fold
-runner.maxStateVisits = 80000
 #newlines.avoidForSimpleOverflow = all
 ===
 system.dynamicAccess.createInstanceFor[Serializer](fqn, Nil).recoverWith {
@@ -10091,7 +10090,7 @@ system.dynamicAccess.createInstanceFor[Serializer](fqn, Nil).recoverWith {
             }
       }
 }
->>> { stateVisits = 72590, stateVisits2 = 72590 }
+>>> { stateVisits = 5817, stateVisits2 = 5817 }
 system.dynamicAccess.createInstanceFor[Serializer](fqn, Nil).recoverWith {
   case _: NoSuchMethodException => system.dynamicAccess
       .createInstanceFor[Serializer](

diff --git a/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala b/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala
@@ -137,7 +137,7 @@ class FormatTests extends FunSuite with CanRunTests with FormatAssertions {
     val explored = Debug.explored.get()
     logger.debug(s"Total explored: $explored")
     if (!onlyUnit && !onlyManual)
-      assertEquals(explored, 1620763, "total explored")
+      assertEquals(explored, 1499555, "total explored")
     val results = debugResults.result()
     // TODO(olafur) don't block printing out test results.
     // I don't want to deal with scalaz's Tasks :'(