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 index 1376c15436..2b46a5dbd5 100644 --- 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) } } }