Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FormatTokensRewrite: track source index explicitly #3869

Merged
merged 1 commit into from
Mar 28, 2024
Merged

FormatTokensRewrite: track source index explicitly #3869

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/FormatTokensRewrite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,32 @@ class FormatTokensRewrite(

val shiftedIndexMap = mutable.Map.empty[Int, Int]

var appended = 0
var removed = 0
var remapped = false // tokenMap doesn't have isEmpty
var appended = 0 // prior to scala 2.13, result didn't have length
var nextidxToCopy = 0

def copySlice(end: Int): Unit = {
val beg = appended + removed
appended += end - beg
result ++= arr.view.slice(beg, end)
val append = end - nextidxToCopy
if (append > 0) {
appended += append
result ++= arr.view.slice(nextidxToCopy, end)
nextidxToCopy = end
}
}

getRewrittenTokens.foreach { repl =>
val ft = repl.ft
val idx = ft.meta.idx
val ftOld = arr(idx)
val rtOld = ftOld.right
@inline def mapOld(dstidx: Int) =
@inline def mapOld(dstidx: Int) = {
remapped = true
tokenMap += FormatTokens.thash(rtOld) -> dstidx
}

copySlice(idx)
nextidxToCopy += 1 // covers current element

def append(): Unit = {
appended += 1
result += ft
Expand All @@ -70,7 +81,6 @@ class FormatTokensRewrite(
mergeWhitespaceLeftToRight(ftOld.meta, rtMeta).foreach { bw =>
arr(nextIdx) = nextFt.copy(meta = rtMeta.copy(between = bw))
}
removed += 1
}
repl.how match {
case ReplacementType.Remove => remove(appended)
Expand All @@ -86,7 +96,7 @@ class FormatTokensRewrite(
}
}

if (appended + removed == 0) ftoks
if (!remapped) ftoks
else {
copySlice(arr.length)
val newarr = result.result()
Expand Down
Loading