diff options
Diffstat (limited to 'modules/textadept/history.lua')
-rw-r--r-- | modules/textadept/history.lua | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/modules/textadept/history.lua b/modules/textadept/history.lua index 8c784c17..f6238a0d 100644 --- a/modules/textadept/history.lua +++ b/modules/textadept/history.lua @@ -33,36 +33,15 @@ local view_history = setmetatable({}, { end }) -local restore_position, pos, first_visible_line = false, nil, nil --- Restore position after a full-buffer undo/redo operation, e.g. after replacing buffer contents --- with a formatting command and then performing an undo. -events.connect(events.UPDATE_UI, function(updated) - if not restore_position or updated & buffer.UPDATE_SELECTION == 0 then return end - restore_position = false - buffer:goto_pos(pos) - view.first_visible_line, pos, first_visible_line = first_visible_line, nil, nil -end) - +local INSERT, DELETE = buffer.MOD_INSERTTEXT, buffer.MOD_DELETETEXT +local UNDO, REDO = buffer.PERFORMED_UNDO, buffer.PERFORMED_REDO -- Listens for text insertion and deletion events and records their locations. events.connect(events.MODIFIED, function(position, mod, text, length) - local buffer = buffer - -- Only interested in text insertion or deletion. - if mod & buffer.MOD_INSERTTEXT > 0 then - if length == buffer.length then - if mod & buffer.MULTILINEUNDOREDO > 0 then restore_position = true end - return -- ignore file loading or replacing buffer contents - end - position = position + length - elseif mod & buffer.MOD_DELETETEXT > 0 then - if buffer.length == 0 then return end -- ignore replacing buffer contents - elseif mod & (buffer.PERFORMED_UNDO | buffer.PERFORMED_REDO) > 0 and - (mod & buffer.MOD_BEFOREDELETE > 0) and length == buffer.length then - -- Save view state for potential undo before it's lost. - pos, first_visible_line = buffer.current_pos, view.first_visible_line - else - return + if mod & (INSERT | DELETE) == 0 or buffer.length == (mod & INSERT > 0 and length or 0) then + return -- ignore non-insertion/deletion, file loading, and replacing buffer contents end - if mod & (buffer.PERFORMED_UNDO | buffer.PERFORMED_REDO) > 0 then return end -- ignore undo/redo + if mod & INSERT > 0 then position = position + length end + if mod & (UNDO | REDO) > 0 then return end -- ignore undo/redo M.record(nil, buffer:line_from_position(position), buffer.column[position]) end) |