aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvatore Benedetto <salvabenedetto@meta.com>2022-11-17 23:47:43 -0800
committerFacebook GitHub Bot <facebook-github-bot@users.noreply.github.com>2022-11-17 23:47:43 -0800
commit506ecd1d3ef181ca696299decacee03f17b8a6ee (patch)
treef66b5881c11d2e660a9748f5030f814a5192e6d5
parentedb23e7919b3d63c3ac2864a5c5412c314ae75b5 (diff)
downloadktfmt-506ecd1d3ef181ca696299decacee03f17b8a6ee.tar.gz
Rename upper to endPosition
Summary: Make it easier to understand Reviewed By: davidtorosyan Differential Revision: D41335534 fbshipit-source-id: 8fb748404a06e97353a07997fb2bdde5e0853f05
-rw-r--r--core/src/main/java/com/facebook/ktfmt/format/KotlinInput.kt7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/src/main/java/com/facebook/ktfmt/format/KotlinInput.kt b/core/src/main/java/com/facebook/ktfmt/format/KotlinInput.kt
index 5fc13d1..f1efe5d 100644
--- a/core/src/main/java/com/facebook/ktfmt/format/KotlinInput.kt
+++ b/core/src/main/java/com/facebook/ktfmt/format/KotlinInput.kt
@@ -196,11 +196,8 @@ class KotlinInput(private val text: String, file: KtFile) : Input() {
val tokenLocations = ImmutableRangeMap.builder<Int, Token>()
for (token in tokens) {
val end = JavaOutput.endTok(token)
- var upper = end.position
- if (end.text.isNotEmpty()) {
- upper += end.length() - 1
- }
- tokenLocations.put(Range.closed(JavaOutput.startTok(token).position, upper), token)
+ val endPosition = end.position + (if (end.text.isNotEmpty()) end.length() - 1 else 0)
+ tokenLocations.put(Range.closed(JavaOutput.startTok(token).position, endPosition), token)
}
return tokenLocations.build()