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

refactor: convert Buffer.MetaWriter to an ArrayListUnmanaged

Browse source
This commit is contained in:
CJ van den Berg 2025-05-27 20:47:13 +02:00
parent 39a57e457d
commit 9023109b21
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/buffer/Buffer.zig
View file

@ -14,7 +14,7 @@ pub const Manager = @import("Manager.zig");
pub const Cursor = @import("Cursor.zig"); pub const Cursor = @import("Cursor.zig");
pub const View = @import("View.zig"); pub const View = @import("View.zig");
pub const Selection = @import("Selection.zig"); pub const Selection = @import("Selection.zig");
pub const MetaWriter = std.ArrayList(u8).Writer; pub const MetaWriter = std.ArrayListUnmanaged(u8).Writer;
pub const Metrics = struct { pub const Metrics = struct {
ctx: *const anyopaque, ctx: *const anyopaque,

24
src/tui/editor.zig
View file

@ -462,9 +462,9 @@ pub const Editor = struct {
} }
fn deinit(self: *Self) void { fn deinit(self: *Self) void {
var meta = std.ArrayList(u8).init(self.allocator); var meta = std.ArrayListUnmanaged(u8).empty;
defer meta.deinit(); defer meta.deinit(self.allocator);
if (self.buffer) |_| self.write_state(meta.writer()) catch {}; if (self.buffer) |_| self.write_state(meta.writer(self.allocator)) catch {};
for (self.diagnostics.items) |*d| d.deinit(self.allocator); for (self.diagnostics.items) |*d| d.deinit(self.allocator);
self.diagnostics.deinit(self.allocator); self.diagnostics.deinit(self.allocator);
if (self.syntax) |syn| syn.destroy(tui.query_cache()); if (self.syntax) |syn| syn.destroy(tui.query_cache());
@ -631,9 +631,9 @@ pub const Editor = struct {
} }
fn close(self: *Self) !void { fn close(self: *Self) !void {
var meta = std.ArrayList(u8).init(self.allocator); var meta = std.ArrayListUnmanaged(u8).empty;
defer meta.deinit(); defer meta.deinit(self.allocator);
self.write_state(meta.writer()) catch {}; self.write_state(meta.writer(self.allocator)) catch {};
if (self.buffer) |b_mut| self.buffer_manager.retire(b_mut, meta.items); if (self.buffer) |b_mut| self.buffer_manager.retire(b_mut, meta.items);
self.cancel_all_selections(); self.cancel_all_selections();
self.buffer = null; self.buffer = null;
@ -697,19 +697,19 @@ pub const Editor = struct {
} }
fn store_undo_meta(self: *Self, allocator: Allocator) ![]u8 { fn store_undo_meta(self: *Self, allocator: Allocator) ![]u8 {
var meta = std.ArrayList(u8).init(allocator); var meta = std.ArrayListUnmanaged(u8).empty;
const writer = meta.writer(); const writer = meta.writer(allocator);
for (self.cursels_saved.items) |*cursel_| if (cursel_.*) |*cursel| for (self.cursels_saved.items) |*cursel_| if (cursel_.*) |*cursel|
try cursel.write(writer); try cursel.write(writer);
return meta.toOwnedSlice(); return meta.toOwnedSlice(allocator);
} }
fn store_current_undo_meta(self: *Self, allocator: Allocator) ![]u8 { fn store_current_undo_meta(self: *Self, allocator: Allocator) ![]u8 {
var meta = std.ArrayList(u8).init(allocator); var meta = std.ArrayListUnmanaged(u8).empty;
const writer = meta.writer(); const writer = meta.writer(allocator);
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel|
try cursel.write(writer); try cursel.write(writer);
return meta.toOwnedSlice(); return meta.toOwnedSlice(allocator);
} }
pub fn update_buf(self: *Self, root: Buffer.Root) !void { pub fn update_buf(self: *Self, root: Buffer.Root) !void {

4
src/tui/mainview.zig
View file

@ -1209,8 +1209,8 @@ pub fn write_restore_info(self: *Self) void {
const editor = self.get_active_editor() orelse return; const editor = self.get_active_editor() orelse return;
var sfa = std.heap.stackFallback(512, self.allocator); var sfa = std.heap.stackFallback(512, self.allocator);
const a = sfa.get(); const a = sfa.get();
var meta = std.ArrayList(u8).init(a); var meta = std.ArrayListUnmanaged(u8).empty;
editor.write_state(meta.writer()) catch return; editor.write_state(meta.writer(a)) catch return;
const file_name = root.get_restore_file_name() catch return; const file_name = root.get_restore_file_name() catch return;
var file = std.fs.createFileAbsolute(file_name, .{ .truncate = true }) catch return; var file = std.fs.createFileAbsolute(file_name, .{ .truncate = true }) catch return;
defer file.close(); defer file.close();