From ac56635f7b547380ecfdeee06577abfe9005cd89 Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Sun, 27 Oct 2024 19:05:03 +0100 Subject: [PATCH] refactor: simplify keybind mode create --- src/keybind/static/mini/file_browser.zig | 4 +--- src/keybind/static/mini/find.zig | 4 +--- src/keybind/static/mini/find_in_files.zig | 4 +--- src/keybind/static/mini/goto.zig | 5 +---- src/keybind/static/mini/move_to_char.zig | 4 +--- src/keybind/static/root.zig | 3 +++ src/tui/mode/mini/file_browser.zig | 2 +- src/tui/mode/mini/find.zig | 2 +- src/tui/mode/mini/find_in_files.zig | 2 +- src/tui/mode/mini/goto.zig | 2 +- src/tui/mode/mini/move_to_char.zig | 2 +- 11 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/keybind/static/mini/file_browser.zig b/src/keybind/static/mini/file_browser.zig index d9c2e45..c700db0 100644 --- a/src/keybind/static/mini/file_browser.zig +++ b/src/keybind/static/mini/file_browser.zig @@ -5,9 +5,7 @@ const event_type = @import("renderer").input.event_type; const command = @import("command"); const EventHandler = @import("EventHandler"); -const Allocator = @import("std").mem.Allocator; - -pub fn create(_: Allocator) EventHandler { +pub fn create() EventHandler { return EventHandler.static(@This()); } diff --git a/src/keybind/static/mini/find.zig b/src/keybind/static/mini/find.zig index 61f5649..e07446c 100644 --- a/src/keybind/static/mini/find.zig +++ b/src/keybind/static/mini/find.zig @@ -5,9 +5,7 @@ const event_type = @import("renderer").input.event_type; const command = @import("command"); const EventHandler = @import("EventHandler"); -const Allocator = @import("std").mem.Allocator; - -pub fn create(_: Allocator) EventHandler { +pub fn create() EventHandler { return EventHandler.static(@This()); } diff --git a/src/keybind/static/mini/find_in_files.zig b/src/keybind/static/mini/find_in_files.zig index 9426300..7605300 100644 --- a/src/keybind/static/mini/find_in_files.zig +++ b/src/keybind/static/mini/find_in_files.zig @@ -5,9 +5,7 @@ const event_type = @import("renderer").input.event_type; const command = @import("command"); const EventHandler = @import("EventHandler"); -const Allocator = @import("std").mem.Allocator; - -pub fn create(_: Allocator) EventHandler { +pub fn create() EventHandler { return EventHandler.static(@This()); } diff --git a/src/keybind/static/mini/goto.zig b/src/keybind/static/mini/goto.zig index af6f51c..3f49b22 100644 --- a/src/keybind/static/mini/goto.zig +++ b/src/keybind/static/mini/goto.zig @@ -5,10 +5,7 @@ const event_type = @import("renderer").input.event_type; const command = @import("command"); const EventHandler = @import("EventHandler"); -const Allocator = @import("std").mem.Allocator; -const fmt = @import("std").fmt; - -pub fn create(_: Allocator) EventHandler { +pub fn create() EventHandler { return EventHandler.static(@This()); } diff --git a/src/keybind/static/mini/move_to_char.zig b/src/keybind/static/mini/move_to_char.zig index db5c501..39da4b7 100644 --- a/src/keybind/static/mini/move_to_char.zig +++ b/src/keybind/static/mini/move_to_char.zig @@ -5,9 +5,7 @@ const event_type = @import("renderer").input.event_type; const command = @import("command"); const EventHandler = @import("EventHandler"); -const Allocator = @import("std").mem.Allocator; - -pub fn create(_: Allocator) EventHandler { +pub fn create() EventHandler { return EventHandler.static(@This()); } diff --git a/src/keybind/static/root.zig b/src/keybind/static/root.zig index 9a75dc5..3daa26e 100644 --- a/src/keybind/static/root.zig +++ b/src/keybind/static/root.zig @@ -1,4 +1,7 @@ pub const mode = struct { + pub const overlay = struct { + pub const palette = @import("overlay/palette.zig"); + }; pub const mini = struct { pub const goto = @import("mini/goto.zig"); pub const move_to_char = @import("mini/move_to_char.zig"); diff --git a/src/tui/mode/mini/file_browser.zig b/src/tui/mode/mini/file_browser.zig index ddf71ef..efe97fb 100644 --- a/src/tui/mode/mini/file_browser.zig +++ b/src/tui/mode/mini/file_browser.zig @@ -53,7 +53,7 @@ pub fn Create(options: type) type { options.restore_state(self) catch {}; return .{ .{ - .input_handler = keybind.mode.mini.file_browser.create(allocator), + .input_handler = keybind.mode.mini.file_browser.create(), .event_handler = EventHandler.to_owned(self), }, .{ diff --git a/src/tui/mode/mini/find.zig b/src/tui/mode/mini/find.zig index b4a78e7..0620c76 100644 --- a/src/tui/mode/mini/find.zig +++ b/src/tui/mode/mini/find.zig @@ -49,7 +49,7 @@ pub fn create(allocator: Allocator, _: command.Context) !struct { tui.Mode, tui. } return .{ .{ - .input_handler = keybind.mode.mini.find.create(allocator), + .input_handler = keybind.mode.mini.find.create(), .event_handler = EventHandler.to_owned(self), }, .{ diff --git a/src/tui/mode/mini/find_in_files.zig b/src/tui/mode/mini/find_in_files.zig index 29f67ac..ccee412 100644 --- a/src/tui/mode/mini/find_in_files.zig +++ b/src/tui/mode/mini/find_in_files.zig @@ -43,7 +43,7 @@ pub fn create(allocator: Allocator, _: command.Context) !struct { tui.Mode, tui. }; return .{ .{ - .input_handler = keybind.mode.mini.find_in_files.create(allocator), + .input_handler = keybind.mode.mini.find_in_files.create(), .event_handler = EventHandler.to_owned(self), }, .{ diff --git a/src/tui/mode/mini/goto.zig b/src/tui/mode/mini/goto.zig index 13ab02c..27d04cb 100644 --- a/src/tui/mode/mini/goto.zig +++ b/src/tui/mode/mini/goto.zig @@ -34,7 +34,7 @@ pub fn create(allocator: Allocator, _: command.Context) !struct { tui.Mode, tui. try self.commands.init(self); return .{ .{ - .input_handler = keybind.mode.mini.goto.create(allocator), + .input_handler = keybind.mode.mini.goto.create(), .event_handler = EventHandler.to_owned(self), }, .{ diff --git a/src/tui/mode/mini/move_to_char.zig b/src/tui/mode/mini/move_to_char.zig index bc7a508..cfb4d94 100644 --- a/src/tui/mode/mini/move_to_char.zig +++ b/src/tui/mode/mini/move_to_char.zig @@ -46,7 +46,7 @@ pub fn create(allocator: Allocator, ctx: command.Context) !struct { tui.Mode, tu try self.commands.init(self); return .{ .{ - .input_handler = keybind.mode.mini.move_to_char.create(allocator), + .input_handler = keybind.mode.mini.move_to_char.create(), .event_handler = EventHandler.to_owned(self), }, .{