github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-25 18:07:07 +09:00
Code Issues Packages 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
parent be69b2580b 0d51035acd
commit 3737979139
1 changed files with 6 additions and 14 deletions
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) eh.UndoTextEvent(t)
// Set the cursor in the right place // Set the cursor in the right place
teCursor := t.C if t.C.Num >= 0 && t.C.Num < len(eh.cursors) {
if teCursor.Num >= 0 && teCursor.Num < len(eh.cursors) { eh.cursors[t.C.Num].Goto(t.C)
t.C = *eh.cursors[teCursor.Num] eh.cursors[t.C.Num].NewTrailingWsY = t.C.NewTrailingWsY
eh.cursors[teCursor.Num].Goto(teCursor)
eh.cursors[teCursor.Num].NewTrailingWsY = teCursor.NewTrailingWsY
} else {
teCursor.Num = -1
} }
// Push it to the redo stack // Push it to the redo stack
@@ -336,13 +332,9 @@ func (eh *EventHandler) RedoOneEvent() {
return return
} }
teCursor := t.C if t.C.Num >= 0 && t.C.Num < len(eh.cursors) {
if teCursor.Num >= 0 && teCursor.Num < len(eh.cursors) { eh.cursors[t.C.Num].Goto(t.C)
t.C = *eh.cursors[teCursor.Num] eh.cursors[t.C.Num].NewTrailingWsY = t.C.NewTrailingWsY
eh.cursors[teCursor.Num].Goto(teCursor)
eh.cursors[teCursor.Num].NewTrailingWsY = teCursor.NewTrailingWsY
} else {
teCursor.Num = -1
} }
// Modifies the text event // Modifies the text event