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

fix: keep existing mode if new mode is not found in enter_mode

Browse source
This commit is contained in:
CJ van den Berg 2024-12-02 19:39:37 +01:00
parent b693b111b2
commit 1e3ea22fb7
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/tui/tui.zig
View file

@ -584,7 +584,10 @@ fn enter_overlay_mode(self: *Self, mode: type) command.Result {
} }
fn get_input_mode(self: *Self, mode_name: []const u8, name: []const u8, opts: anytype) !Mode { fn get_input_mode(self: *Self, mode_name: []const u8, name: []const u8, opts: anytype) !Mode {
const input_handler, const keybind_hints = try keybind.mode(mode_name, self.allocator, opts); const input_handler, const keybind_hints = keybind.mode(mode_name, self.allocator, opts) catch |e| switch (e) {
error.NotFound => return error.Stop,
else => return e,
};
return .{ return .{
.input_handler = input_handler, .input_handler = input_handler,
.keybind_hints = keybind_hints, .keybind_hints = keybind_hints,
@ -696,16 +699,11 @@ const cmds = struct {
self.delayed_init_input_mode = try self.allocator.dupe(u8, mode); self.delayed_init_input_mode = try self.allocator.dupe(u8, mode);
return; return;
} }
if (self.mini_mode) |_| try exit_mini_mode(self, .{});
if (self.input_mode_outer) |_| try exit_overlay_mode(self, .{});
if (self.input_mode) |*m| {
m.deinit();
self.input_mode = null;
}
const current_namespace = keybind.get_namespace(); const current_namespace = keybind.get_namespace();
const is_vim_mode = std.mem.eql(u8, current_namespace, "vim"); const is_vim_mode = std.mem.eql(u8, current_namespace, "vim");
const is_helix_mode = std.mem.eql(u8, current_namespace, "helix"); const is_helix_mode = std.mem.eql(u8, current_namespace, "helix");
self.input_mode = if (is_vim_mode and std.mem.eql(u8, mode, "normal")) var new_mode = if (is_vim_mode and std.mem.eql(u8, mode, "normal"))
try self.get_input_mode("normal", "NORMAL", .{ try self.get_input_mode("normal", "NORMAL", .{
.line_numbers_relative = self.config.vim_normal_gutter_line_numbers_relative, .line_numbers_relative = self.config.vim_normal_gutter_line_numbers_relative,
.cursor_shape = .block, .cursor_shape = .block,
@ -742,6 +740,15 @@ const cmds = struct {
break :ret try self.get_input_mode(keybind.default_mode, current_namespace, .{}); break :ret try self.get_input_mode(keybind.default_mode, current_namespace, .{});
}; };
}; };
errdefer new_mode.deinit();
if (self.mini_mode) |_| try exit_mini_mode(self, .{});
if (self.input_mode_outer) |_| try exit_overlay_mode(self, .{});
if (self.input_mode) |*m| {
m.deinit();
self.input_mode = null;
}
self.input_mode = new_mode;
// self.logger.print("input mode: {s}", .{(self.input_mode orelse return).description}); // self.logger.print("input mode: {s}", .{(self.input_mode orelse return).description});
} }
pub const enter_mode_meta = .{ .arguments = &.{.string} }; pub const enter_mode_meta = .{ .arguments = &.{.string} };