Skip to content

Fix cursor moving to an unexpected location after a redo #3416

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
dmaluka merged 2 commits into from
Aug 15, 2024
Merged

Fix cursor moving to an unexpected location after a redo #3416

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
658c20f
undo/redo: Don't change remembered cursor location
dmaluka Aug 4, 2024
0d51035
undo/redo: Remove no longer needed teCursor temp var
dmaluka Aug 4, 2024
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
20 changes: 6 additions & 14 deletions internal/buffer/eventhandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,13 +291,9 @@ func (eh *EventHandler) UndoOneEvent() {
eh.UndoTextEvent(t)

// Set the cursor in the right place
teCursor := t.C
if teCursor.Num >= 0 && teCursor.Num < len(eh.cursors) {
t.C = *eh.cursors[teCursor.Num]
eh.cursors[teCursor.Num].Goto(teCursor)
eh.cursors[teCursor.Num].NewTrailingWsY = teCursor.NewTrailingWsY
} else {
teCursor.Num = -1
if t.C.Num >= 0 && t.C.Num < len(eh.cursors) {
eh.cursors[t.C.Num].Goto(t.C)
eh.cursors[t.C.Num].NewTrailingWsY = t.C.NewTrailingWsY
}

// Push it to the redo stack
Expand Down Expand Up @@ -336,13 +332,9 @@ func (eh *EventHandler) RedoOneEvent() {
return
}

teCursor := t.C
if teCursor.Num >= 0 && teCursor.Num < len(eh.cursors) {
t.C = *eh.cursors[teCursor.Num]
eh.cursors[teCursor.Num].Goto(teCursor)
eh.cursors[teCursor.Num].NewTrailingWsY = teCursor.NewTrailingWsY
} else {
teCursor.Num = -1
if t.C.Num >= 0 && t.C.Num < len(eh.cursors) {
eh.cursors[t.C.Num].Goto(t.C)
eh.cursors[t.C.Num].NewTrailingWsY = t.C.NewTrailingWsY
}

// Modifies the text event
Expand Down