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

feat(buffer): restore eol_mode in undo/redo/reset operations

Browse source
This commit is contained in:
CJ van den Berg 2025-02-11 11:49:20 +01:00
parent 02ba05c500
commit d305e7844d
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/buffer/Buffer.zig
View file

@ -62,6 +62,7 @@ const UndoNode = struct {
next: ?*UndoNode = null, next: ?*UndoNode = null,
branches: ?*UndoBranch = null, branches: ?*UndoBranch = null,
meta: []const u8, meta: []const u8,
file_eol_mode: EolMode,
}; };
const UndoBranch = struct { const UndoBranch = struct {
@ -1248,6 +1249,7 @@ pub fn reset_to_last_saved(self: *Self) void {
if (self.last_save) |last_save| { if (self.last_save) |last_save| {
self.store_undo(&[_]u8{}) catch {}; self.store_undo(&[_]u8{}) catch {};
self.root = last_save; self.root = last_save;
self.file_eol_mode = self.last_save_eol_mode;
self.mtime = std.time.milliTimestamp(); self.mtime = std.time.milliTimestamp();
} }
} }
@ -1385,6 +1387,7 @@ fn create_undo(self: *const Self, root: Root, meta_: []const u8) error{OutOfMemo
h.* = UndoNode{ h.* = UndoNode{
.root = root, .root = root,
.meta = meta, .meta = meta,
.file_eol_mode = self.file_eol_mode,
}; };
return h; return h;
} }
@ -1420,6 +1423,7 @@ pub fn undo(self: *Self, meta: []const u8) error{Stop}![]const u8 {
self.undo_history = h.next; self.undo_history = h.next;
self.curr_history = h; self.curr_history = h;
self.root = h.root; self.root = h.root;
self.file_eol_mode = h.file_eol_mode;
self.push_redo(r); self.push_redo(r);
self.mtime = std.time.milliTimestamp(); self.mtime = std.time.milliTimestamp();
return h.meta; return h.meta;
@ -1432,6 +1436,7 @@ pub fn redo(self: *Self) error{Stop}![]const u8 {
self.redo_history = h.next; self.redo_history = h.next;
self.curr_history = h; self.curr_history = h;
self.root = h.root; self.root = h.root;
self.file_eol_mode = h.file_eol_mode;
self.push_undo(u); self.push_undo(u);
self.mtime = std.time.milliTimestamp(); self.mtime = std.time.milliTimestamp();
return h.meta; return h.meta;