Scalameta: upgrade to v4.9.8

scalameta · Jul 8, 2024 · 8482946 · 8482946
1 parent 1d5350d
commit 8482946
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -8,7 +8,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 
 object Dependencies {
   val metaconfigV = "0.12.0"
-  val scalametaV  = "4.9.7"
+  val scalametaV  = "4.9.8"
   val scalacheckV = "1.18.0"
   val coursier    = "2.1.10"
   val munitV      = "1.0.0"

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatToken.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatToken.scala
@@ -75,6 +75,11 @@ object FormatToken {
 
   @inline
   def isNL(token: Token): Boolean = token.is[Token.AtEOL]
+  @inline
+  def newlines(token: Token): Int = token match {
+    case t: Token.AtEOL => t.newlines
+    case _ => 0
+  }
 
   /** @param between
     *   The whitespace tokens between left and right.
@@ -101,9 +106,8 @@ object FormatToken {
       def count(idx: Int, maxCount: Int): Int =
         if (idx == between.length) maxCount
         else {
-          val token = between(idx)
-          if (isNL(token)) if (maxCount == 0) count(idx + 1, 1) else 2
-          else count(idx + 1, maxCount)
+          val newMaxCount = maxCount + newlines(between(idx))
+          if (newMaxCount < 2) count(idx + 1, newMaxCount) else 2
         }
       count(0, 0)
     }