github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-19 23:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Synchronize undo and redo chunks

Browse Source 
Fixes #1372
Fxies #1471
This commit is contained in:
Zachary Yedidia
2020-02-02 00:14:56 -05:00
parent bcb1947a0a
commit d94b81b8e6
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/buffer/eventhandler.go
View File

@@ -21,7 +21,7 @@ const (
// TextEventReplace represents a replace event
TextEventReplace = 0
undoThreshold = 500 // If two events are less than n milliseconds apart, undo both of them
undoThreshold = 1000 // If two events are less than n milliseconds apart, undo both of them
)
// TextEvent holds data for a manipulation on some text that can be undone
@@ -211,8 +211,7 @@ func (eh *EventHandler) Undo() {
}
startTime := t.Time.UnixNano() / int64(time.Millisecond)
eh.UndoOneEvent()
endTime := startTime - (startTime % undoThreshold)
for {
t = eh.UndoStack.Peek()
@@ -220,10 +219,9 @@ func (eh *EventHandler) Undo() {
return
}
if startTime-(t.Time.UnixNano()/int64(time.Millisecond)) > undoThreshold {
if t.Time.UnixNano()/int64(time.Millisecond) < endTime {
return
}
startTime = t.Time.UnixNano() / int64(time.Millisecond)
eh.UndoOneEvent()
}
@@ -263,8 +261,7 @@ func (eh *EventHandler) Redo() {
}
startTime := t.Time.UnixNano() / int64(time.Millisecond)
eh.RedoOneEvent()
endTime := startTime - (startTime % undoThreshold) + undoThreshold
for {
t = eh.RedoStack.Peek()
@@ -272,7 +269,7 @@ func (eh *EventHandler) Redo() {
return
}
if (t.Time.UnixNano()/int64(time.Millisecond))-startTime > undoThreshold {
if t.Time.UnixNano()/int64(time.Millisecond) > endTime {
return
}