Skip to content

[INSTL-182] Revert AbstractTextInput ReplaceTextOperation changes #3

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

Merged
RedEpicness merged 2 commits into from
Apr 7, 2025
Merged

[INSTL-182] Revert AbstractTextInput ReplaceTextOperation changes #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1dc061
AbstractTextInput: Revert old ReplaceTextOperation fix
CallumBugajski Apr 5, 2025
9570b57
AbstractTextInput: Add new ReplaceTextOperation fix
CallumBugajski Apr 5, 2025
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
41 changes: 17 additions & 24 deletions installer/src/main/kotlin/gg/essential/installer/gui/component/text/AbstractTextInput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,10 +449,12 @@ abstract class AbstractTextInput(

val absoluteStart = LinePosition(0, 0, isVisual = true)
val replaceTextOperation = ReplaceTextOperation(
absoluteStart,
LinePosition(visualLines.lastIndex, visualLines.last().length, isVisual = true),
newText,
true
AddTextOperation(newText, absoluteStart),
RemoveTextOperation(
absoluteStart,
LinePosition(visualLines.lastIndex, visualLines.last().length, isVisual = true),
selectAfterUndo = true
)
)
commitTextOperation(replaceTextOperation)
}
Expand Down Expand Up @@ -523,13 +525,16 @@ abstract class AbstractTextInput(
return
}

val addTextOperation = AddTextOperation(text, selectionStart())

if (hasSelection()) {
val replaceTextOperation = ReplaceTextOperation(selectionStart(), selectionEnd(), newText, true)
val removeTextOperation = RemoveTextOperation(selectionStart(), selectionEnd(), selectAfterUndo = true)
val replaceTextOperation = ReplaceTextOperation(addTextOperation, removeTextOperation)
commitTextOperation(replaceTextOperation)
return
}

commitTextOperation(AddTextOperation(text, cursor))
commitTextOperation(addTextOperation)
}

protected fun addText(newText: String, position: LinePosition) {
Expand Down Expand Up @@ -1100,29 +1105,17 @@ abstract class AbstractTextInput(
}

protected inner class ReplaceTextOperation(
private val startPos: LinePosition,
private val endPos: LinePosition,
private val newText: String,
private val selectAfterUndo: Boolean,
val addTextOperation: AddTextOperation,
val removeTextOperation: RemoveTextOperation
) : TextOperation() {
private val textOld = getTextBetween(startPos, endPos)
private var removeStartPos: LinePosition = startPos

override fun redo() {
removeText(startPos, endPos)
removeStartPos = minOf(cursor, startPos)
addText(newText, removeStartPos)
removeTextOperation.redo()
addTextOperation.redo()
}

override fun undo() {
removeText(removeStartPos, removeStartPos.offsetColumn(newText.length))
addText(textOld, startPos)
setCursorPosition(endPos.toVisualPos())
if (selectAfterUndo) {
cursor = startPos
otherSelectionEnd = endPos
cursorNeedsRefocus = true
}
addTextOperation.undo()
removeTextOperation.undo()
}
}

Expand Down
Loading