fix crash if hit "Shift + Down" at the last row in BigMonospaceTextField

sunny-chung · Nov 16, 2024 · 8aaa151 · 8aaa151
1 parent 2d27204
commit 8aaa151
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.../kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigMonospaceText.kt b/.../kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigMonospaceText.kt
@@ -946,14 +946,14 @@ private fun CoreBigMonospaceText(
                             } else {
                                 transformedText.length
                             } - transformedText.findRowPositionStartIndexByRowIndex(newRow)
-                            if (col <= newRowLength) {
+                            val pos = if (col <= newRowLength) {
                                 transformedText.findRowPositionStartIndexByRowIndex(newRow) + col
                             } else {
                                 transformedText.findRowPositionStartIndexByRowIndex(newRow) + newRowLength
                             }
+                            viewState.roundedTransformedCursorIndex(pos, CursorAdjustDirection.Bidirectional, transformedText, viewState.transformedCursorIndex, true)
                         }
                     }
-                    newTransformedPosition = viewState.roundedTransformedCursorIndex(newTransformedPosition, CursorAdjustDirection.Bidirectional, transformedText, viewState.transformedCursorIndex, true)
                     updateTransformedCursorOrSelection(
                         newTransformedPosition = newTransformedPosition,
                         isSelection = it.isShiftPressed,

diff --git a/.../kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigTextViewState.kt b/.../kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigTextViewState.kt
@@ -45,8 +45,12 @@ class BigTextViewState {
     }
 
     internal fun updateSelectionByTransformedSelection(transformedText: BigTextTransformed) {
-        selection = transformedText.findOriginalPositionByTransformedPosition(transformedSelection.first) ..
+        selection = if (transformedSelection.isEmpty()) {
+            EMPTY_SELECTION_RANGE
+        } else {
+            transformedText.findOriginalPositionByTransformedPosition(transformedSelection.first) ..
                 transformedText.findOriginalPositionByTransformedPosition(transformedSelection.last)
+        }
     }
 
     internal fun updateTransformedSelectionBySelection(transformedText: BigTextTransformed) {