neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: pause_/resume_undo_history should correctly store/restore an undo point

Browse source
This commit is contained in:
CJ van den Berg 2025-04-07 21:10:10 +02:00
parent 63270246d9
commit 716f871d03
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/tui/editor.zig
View file

@ -269,6 +269,7 @@ pub const Editor = struct {
buffer_manager: *Buffer.Manager, buffer_manager: *Buffer.Manager,
lsp_version: usize = 1, lsp_version: usize = 1,
pause_undo: bool = false, pause_undo: bool = false,
pause_undo_root: ?Buffer.Root = null,
cursels: CurSel.List, cursels: CurSel.List,
cursels_saved: CurSel.List, cursels_saved: CurSel.List,
@ -780,11 +781,23 @@ pub const Editor = struct {
pub fn pause_undo_history(self: *Self, _: Context) Result { pub fn pause_undo_history(self: *Self, _: Context) Result {
self.pause_undo = true; self.pause_undo = true;
self.pause_undo_root = self.buf_root() catch return;
self.cursels_saved.clearAndFree();
self.cursels_saved = try self.cursels.clone();
} }
pub const pause_undo_history_meta: Meta = .{ .description = "Pause undo history" }; pub const pause_undo_history_meta: Meta = .{ .description = "Pause undo history" };
pub fn resume_undo_history(self: *Self, _: Context) Result { pub fn resume_undo_history(self: *Self, _: Context) Result {
self.pause_undo = false; self.pause_undo = false;
const b = self.buffer orelse return;
var sfa = std.heap.stackFallback(512, self.allocator);
const allocator = sfa.get();
const meta = try self.store_undo_meta(allocator);
defer allocator.free(meta);
const root = self.buf_root() catch return;
if (self.pause_undo_root) |paused_root| b.update(paused_root);
try b.store_undo(meta);
b.update(root);
} }
pub const resume_undo_history_meta: Meta = .{ .description = "Resume undo history" }; pub const resume_undo_history_meta: Meta = .{ .description = "Resume undo history" };