Fix caret out of bound issues

romainguy · May 3, 2024 · ceb593e · ceb593e
1 parent 64c3fbc
commit ceb593e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/jvmMain/kotlin/dev/romainguy/kotlin/explorer/CodeTextArea.kt b/src/jvmMain/kotlin/dev/romainguy/kotlin/explorer/CodeTextArea.kt
@@ -53,7 +53,7 @@ open class CodeTextArea(
     fun refreshText() {
         val saveCaret = caretPosition
         super.setText(fullText.takeIf { explorerState.showLineNumbers } ?: fullText.removeLineLumbers())
-        caretPosition = saveCaret
+        caretPosition = minOf(saveCaret, document.length)
     }
 
     override fun paintComponent(g: Graphics?) {

diff --git a/src/jvmMain/kotlin/dev/romainguy/kotlin/explorer/KotlinExplorer.kt b/src/jvmMain/kotlin/dev/romainguy/kotlin/explorer/KotlinExplorer.kt
@@ -134,7 +134,6 @@ private fun FrameWindowScope.KotlinExplorer(
             } else {
                 dexTextArea.refreshText()
             }
-
         },
         { oat -> updateTextArea(oatTextArea, oat) },
         { statusUpdate -> status = statusUpdate },
@@ -193,7 +192,9 @@ private fun SourcePanel(sourceTextArea: RSyntaxTextArea, explorerState: Explorer
                 RTextScrollPane(sourceTextArea)
             },
             update = {
-                sourceTextArea.text = explorerState.sourceCode
+                if (explorerState.sourceCode != sourceTextArea.text) {
+                    sourceTextArea.text = explorerState.sourceCode
+                }
                 sourceTextArea.updateStyle(explorerState)
             }
         )