zyedidia/micro
1
1
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2024-09-11 12:15:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3416 from dmaluka/undo-cursor-fix

Browse Source 
Fix cursor moving to an unexpected location after a redo
This commit is contained in:
Dmytro Maluka 2024-08-15 16:07:51 +02:00 committed by GitHub
commit 3737979139
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/buffer/eventhandler.go
View File

@ -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
@ -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