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

refactor: store trigger commands as strings

Browse source 
Because command IDs are not stable across restarts.
This commit is contained in:
CJ van den Berg 2025-12-23 22:36:16 +01:00
parent 7d2e6a3b45
commit ed027b5f6d
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tui/editor.zig
View file

@ -270,11 +270,16 @@ pub const TriggerSymbol = struct {
pub fn cborEncode(self: @This(), writer: *std.Io.Writer) std.io.Writer.Error!void { pub fn cborEncode(self: @This(), writer: *std.Io.Writer) std.io.Writer.Error!void {
try cbor.writeArrayHeader(writer, 2); try cbor.writeArrayHeader(writer, 2);
try cbor.writeValue(writer, self.char); try cbor.writeValue(writer, self.char);
try cbor.writeValue(writer, self.command); try cbor.writeValue(writer, command.get_name(self.command));
} }
pub fn cborExtract(self: *@This(), iter: *[]const u8) cbor.Error!bool { pub fn cborExtract(self: *@This(), iter: *[]const u8) cbor.Error!bool {
return try cbor.matchValue(iter, .{ cbor.extract(&self.char), cbor.extract(&self.command) }); var command_name: []const u8 = undefined;
if (try cbor.matchValue(iter, .{ cbor.extract(&self.char), cbor.extract(&command_name) })) {
self.command = command.get_id(command_name) orelse command.ID_unknown;
return true;
}
return false;
} }
}; };
@ -496,8 +501,8 @@ pub const Editor = struct {
try cbor.writeValue(writer, self.tab_width); try cbor.writeValue(writer, self.tab_width);
try cbor.writeValue(writer, self.indent_mode); try cbor.writeValue(writer, self.indent_mode);
try cbor.writeValue(writer, self.syntax_no_render); try cbor.writeValue(writer, self.syntax_no_render);
try cbor.writeValue(writer, self.insert_triggers); try cbor.writeValue(writer, self.insert_triggers.items);
try cbor.writeValue(writer, self.delete_triggers); try cbor.writeValue(writer, self.delete_triggers.items);
if (self.find_history) |history| { if (self.find_history) |history| {
try cbor.writeArrayHeader(writer, history.items.len); try cbor.writeArrayHeader(writer, history.items.len);
for (history.items) |item| for (history.items) |item|
@ -519,6 +524,8 @@ pub const Editor = struct {
var view_cbor: []const u8 = undefined; var view_cbor: []const u8 = undefined;
var cursels_cbor: []const u8 = undefined; var cursels_cbor: []const u8 = undefined;
var last_find_query: []const u8 = undefined; var last_find_query: []const u8 = undefined;
var insert_triggers: []TriggerSymbol = undefined;
var delete_triggers: []TriggerSymbol = undefined;
var find_history: []const u8 = undefined; var find_history: []const u8 = undefined;
if (!try cbor.matchValue(iter, .{ if (!try cbor.matchValue(iter, .{
tp.extract(&file_path), tp.extract(&file_path),
@ -528,13 +535,17 @@ pub const Editor = struct {
tp.extract(&self.tab_width), tp.extract(&self.tab_width),
tp.extract(&self.indent_mode), tp.extract(&self.indent_mode),
tp.extract(&self.syntax_no_render), tp.extract(&self.syntax_no_render),
cbor.extractAlloc(&self.insert_triggers, self.allocator), cbor.extractAlloc(&insert_triggers, self.allocator),
cbor.extractAlloc(&self.delete_triggers, self.allocator), cbor.extractAlloc(&delete_triggers, self.allocator),
tp.extract_cbor(&find_history), tp.extract_cbor(&find_history),
tp.extract_cbor(&view_cbor), tp.extract_cbor(&view_cbor),
tp.extract_cbor(&cursels_cbor), tp.extract_cbor(&cursels_cbor),
})) }))
return error.RestoreStateMatch; return error.RestoreStateMatch;
self.insert_triggers.deinit(self.allocator);
self.insert_triggers = .fromOwnedSlice(insert_triggers);
self.delete_triggers.deinit(self.allocator);
self.delete_triggers = .fromOwnedSlice(delete_triggers);
self.refresh_tab_width(); self.refresh_tab_width();
if (op == .open_file) if (op == .open_file)
try self.open(file_path); try self.open(file_path);