FormatTokens: improve token lookup when rewritten

scalameta · Mar 16, 2024 · 385c662 · 385c662
1 parent 8c00f0e
commit 385c662
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatTokens.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatTokens.scala
@@ -37,10 +37,11 @@ class FormatTokens(leftTok2tok: Map[TokenOps.TokenHash, Int])(
     if (idx >= arr.length) arr.last
     else {
       val ft = arr(idx)
-      if (isBefore) {
-        if (ft.left.start <= tok.start) ft else at(idx - 1)
+      if (ft.left eq tok) ft
+      else if (isBefore) {
+        if (ft.left.start < tok.start) ft else at(idx - 1)
       } else {
-        if (ft.left.start >= tok.start) ft else at(idx + 1)
+        if (ft.left.start > tok.start) ft else at(idx + 1)
       }
     }
   }