Router: fix single line end for Mod.Annot

scalameta · Oct 12, 2024 · 270b278 · 270b278
1 parent 6d1d793
commit 270b278
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
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
@@ -632,12 +632,15 @@ class Router(formatOps: FormatOps) {
               case _ => noBreak() && Reserved(right)
             })
           def expire = (rightOwner match {
-            case Tree.WithBody(body) => tokenBeforeOpt(body)
+            case Tree.WithBody(body) => tokenBeforeOpt(body).map { x =>
+                val y = nextNonCommentSameLine(x)
+                val ok = (x ne y) && y.noBreak && y.right.is[T.LeftBrace]
+                if (ok) y.right else y.left
+              }
+            case t: Mod.Annot if !style.newlines.keep =>
+              getLastOpt(t).map(endOfSingleLineBlock)
             case _ => None
-          }).fold(right) { x =>
-            val y = nextNonCommentSameLine(x)
-            if (y.noBreak && y.right.is[T.LeftBrace]) y.right else y.left
-          }
+          }).getOrElse(right)
           Seq(
             // This split needs to have an optimalAt field.
             Split(Space, 0).onlyIf(spaceCouldBeOk).withSingleLine(expire),

diff --git a/...intellij/src/test/scala/org/scalafmt/community/intellij/CommunityIntellijScalaSuite.scala b/...intellij/src/test/scala/org/scalafmt/community/intellij/CommunityIntellijScalaSuite.scala
@@ -86,7 +86,7 @@ class CommunityIntellijScala_2024_3_Suite
       "classic" -> TestStats.Style(expectedStatesVisited = 5134862),
       "classicWithAlign" -> TestStats.Style(expectedStatesVisited = 5139218),
       "classicWithRewrites" -> TestStats.Style(expectedStatesVisited = 5134172),
-      "fold" -> TestStats.Style(expectedStatesVisited = 7953034),
+      "fold" -> TestStats.Style(expectedStatesVisited = 7953020),
       "keep" -> TestStats.Style(expectedStatesVisited = 4737913),
       "keepWithAlign" -> TestStats.Style(expectedStatesVisited = 4739065),
       "keepWithRewrites" -> TestStats.Style(expectedStatesVisited = 4748954),

diff --git a/...-community/scala2/src/test/scala/org/scalafmt/community/scala2/CommunityScala2Suite.scala b/...-community/scala2/src/test/scala/org/scalafmt/community/scala2/CommunityScala2Suite.scala
@@ -18,7 +18,7 @@ class CommunityScala2_12Suite extends CommunityScala2Suite("scala-2.12") {
       "classic" -> TestStats.Style(expectedStatesVisited = 3742070),
       "classicWithAlign" -> TestStats.Style(expectedStatesVisited = 3743075),
       "classicWithRewrites" -> TestStats.Style(expectedStatesVisited = 3782691),
-      "fold" -> TestStats.Style(expectedStatesVisited = 5833324),
+      "fold" -> TestStats.Style(expectedStatesVisited = 5833298),
       "keep" -> TestStats.Style(expectedStatesVisited = 3511074),
       "keepWithAlign" -> TestStats.Style(expectedStatesVisited = 3511201),
       "keepWithRewrites" -> TestStats.Style(expectedStatesVisited = 3557273),
@@ -39,7 +39,7 @@ class CommunityScala2_13Suite extends CommunityScala2Suite("scala-2.13") {
       "classic" -> TestStats.Style(expectedStatesVisited = 4633753),
       "classicWithAlign" -> TestStats.Style(expectedStatesVisited = 4636193),
       "classicWithRewrites" -> TestStats.Style(expectedStatesVisited = 4666475),
-      "fold" -> TestStats.Style(expectedStatesVisited = 7586002),
+      "fold" -> TestStats.Style(expectedStatesVisited = 7586042),
       "keep" -> TestStats.Style(expectedStatesVisited = 4329252),
       "keepWithAlign" -> TestStats.Style(expectedStatesVisited = 4329386),
       "keepWithRewrites" -> TestStats.Style(expectedStatesVisited = 4373731),

diff --git a/...-community/scala3/src/test/scala/org/scalafmt/community/scala3/CommunityScala3Suite.scala b/...-community/scala3/src/test/scala/org/scalafmt/community/scala3/CommunityScala3Suite.scala
@@ -18,7 +18,7 @@ class CommunityScala3_2Suite extends CommunityScala3Suite("scala-3.2") {
       "classic" -> TestStats.Style(expectedStatesVisited = 3550612),
       "classicWithAlign" -> TestStats.Style(expectedStatesVisited = 3552306),
       "classicWithRewrites" -> TestStats.Style(expectedStatesVisited = 3558246),
-      "fold" -> TestStats.Style(expectedStatesVisited = 5817619),
+      "fold" -> TestStats.Style(expectedStatesVisited = 5817143),
       "keep" -> TestStats.Style(expectedStatesVisited = 3148692),
       "keepWithAlign" -> TestStats.Style(expectedStatesVisited = 3148747),
       "keepWithRewrites" -> TestStats.Style(expectedStatesVisited = 3079850),
@@ -39,7 +39,7 @@ class CommunityScala3_3Suite extends CommunityScala3Suite("scala-3.3") {
       "classic" -> TestStats.Style(expectedStatesVisited = 3829673),
       "classicWithAlign" -> TestStats.Style(expectedStatesVisited = 3831499),
       "classicWithRewrites" -> TestStats.Style(expectedStatesVisited = 3839204),
-      "fold" -> TestStats.Style(expectedStatesVisited = 6310491),
+      "fold" -> TestStats.Style(expectedStatesVisited = 6309907),
       "keep" -> TestStats.Style(expectedStatesVisited = 3388129),
       "keepWithAlign" -> TestStats.Style(expectedStatesVisited = 3388188),
       "keepWithRewrites" -> TestStats.Style(expectedStatesVisited = 3321872),

diff --git a/...sts-community/spark/src/test/scala/org/scalafmt/community/spark/CommunitySparkSuite.scala b/...sts-community/spark/src/test/scala/org/scalafmt/community/spark/CommunitySparkSuite.scala
@@ -18,7 +18,7 @@ class CommunitySpark3_4Suite extends CommunitySparkSuite("spark-3.4") {
       "classic" -> TestStats.Style(expectedStatesVisited = 7822344),
       "classicWithAlign" -> TestStats.Style(expectedStatesVisited = 7822643),
       "classicWithRewrites" -> TestStats.Style(expectedStatesVisited = 7794473),
-      "fold" -> TestStats.Style(expectedStatesVisited = 12245923),
+      "fold" -> TestStats.Style(expectedStatesVisited = 12245865),
       "keep" -> TestStats.Style(expectedStatesVisited = 6827133),
       "keepWithAlign" -> TestStats.Style(expectedStatesVisited = 6827259),
       "keepWithRewrites" -> TestStats.Style(expectedStatesVisited = 6841859),
@@ -39,7 +39,7 @@ class CommunitySpark3_5Suite extends CommunitySparkSuite("spark-3.5") {
       "classic" -> TestStats.Style(expectedStatesVisited = 8277862),
       "classicWithAlign" -> TestStats.Style(expectedStatesVisited = 8278013),
       "classicWithRewrites" -> TestStats.Style(expectedStatesVisited = 8254489),
-      "fold" -> TestStats.Style(expectedStatesVisited = 12884359),
+      "fold" -> TestStats.Style(expectedStatesVisited = 12884283),
       "keep" -> TestStats.Style(expectedStatesVisited = 7218789),
       "keepWithAlign" -> TestStats.Style(expectedStatesVisited = 7218811),
       "keepWithRewrites" -> TestStats.Style(expectedStatesVisited = 7237620),

diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
@@ -9789,11 +9789,9 @@ abstract class MacroBenchmark(parallel: Boolean, maxFiles: Int)
   }
 >>>
 @org.openjdk.jmh.annotations.State(Scope.Benchmark)
-@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) @Measurement(
-  iterations = 5,
-  time = 1,
-  timeUnit = TimeUnit.SECONDS
-) @BenchmarkMode(Array(Mode.AverageTime)) @OutputTimeUnit(TimeUnit.SECONDS)
+@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+@BenchmarkMode(Array(Mode.AverageTime)) @OutputTimeUnit(TimeUnit.SECONDS)
 abstract class MacroBenchmark(parallel: Boolean, maxFiles: Int)
     extends FormatBenchmark {
   var files: GenIterable[String] = _

diff --git a/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala b/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala
@@ -138,7 +138,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, 1494398, "total explored")
+      assertEquals(explored, 1495182, "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 :'(