From 0bd01afe5369cb8f8d9ec397c8846fa1edc455ba Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Wed, 26 Feb 2025 21:59:42 +0100 Subject: [PATCH 1/2] feat: add hypersubatomic theme --- build.zig.zon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index 89c4af7..c4a9e08 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -22,8 +22,8 @@ .hash = "1220b05b5949454bf155a802d5034c060431b8bf59f9d4d2d5241397e9fd201d78d9", }, .themes = .{ - .url = "https://github.com/neurocyte/flow-themes/releases/download/master-618a7801d3383049adfe18cc09f5f5086c66995f/flow-themes.tar.gz", - .hash = "1220019ed92f48fb94d4ae82bba17b11d0ba06f17ed31cd66613b3c048b1d2382095", + .url = "https://github.com/neurocyte/flow-themes/releases/download/master-59bf204551bcb238faddd06779063570e7e6d431/flow-themes.tar.gz", + .hash = "12209a213a392ea80ea5c7dde125e7161bb0278ac4b99db9df2b7af783710bcb09f7", }, .fuzzig = .{ .url = "https://github.com/fjebaker/fuzzig/archive/0fd156d5097365151e85a85eef9d8cf0eebe7b00.tar.gz", From 67f1ab16974d9c7e062ca6954ef590aaa9a187b2 Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Wed, 26 Feb 2025 22:03:50 +0100 Subject: [PATCH 2/2] feat: add smart_insert_pair command closes #90 --- src/keybind/builtin/flow.json | 10 ++++++++++ src/tui/editor.zig | 27 ++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/keybind/builtin/flow.json b/src/keybind/builtin/flow.json index 902d8dc..e109961 100644 --- a/src/keybind/builtin/flow.json +++ b/src/keybind/builtin/flow.json @@ -161,6 +161,16 @@ ["tab", "indent"], ["ctrl+space", "enter_mode", "select"], + ["\"", "smart_insert_pair", "\"", "\""], + ["'", "smart_insert_pair", "'", "'"], + ["(", "smart_insert_pair", "(", ")"], + ["[", "smart_insert_pair", "[", "]"], + ["{", "smart_insert_pair", "{", "}"], + ["‘", "smart_insert_pair", "‘", "’"], + ["“", "smart_insert_pair", "“", "”"], + ["‚", "smart_insert_pair", "‚", "‘"], + ["«", "smart_insert_pair", "«", "»"], + ["left_control", "enable_jump_mode"], ["right_control", "enable_jump_mode"], ["left_alt", "enable_fast_scroll"], diff --git a/src/tui/editor.zig b/src/tui/editor.zig index 80f9ee4..12b0af2 100644 --- a/src/tui/editor.zig +++ b/src/tui/editor.zig @@ -615,7 +615,7 @@ pub const Editor = struct { } if (self.buffer) |buffer| if (buffer.get_meta()) |meta| { - const frame_ = tracy.initZone(@src(), .{ .name = "extract_state" }); + const frame_ = tracy.initZone(@src(), .{ .name = extract_state }); defer frame_.deinit(); try self.extract_state(meta, .none); }; @@ -4059,6 +4059,31 @@ pub const Editor = struct { } pub const smart_buffer_append_meta = .{ .arguments = &.{.string} }; + pub fn smart_insert_pair(self: *Self, ctx: Context) Result { + var chars_left: []const u8 = undefined; + var chars_right: []const u8 = undefined; + if (!try ctx.args.match(.{ tp.extract(&chars_left), tp.extract(&chars_right) })) + return error.InvalidSmartInsertPairArguments; + const b = try self.buf_for_update(); + var root = b.root; + for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| { + if (cursel.selection) |*sel| { + var begin: CurSel = .{ .cursor = sel.begin }; + root = try self.insert(root, &begin, chars_left, b.allocator); + var end: CurSel = .{ .cursor = sel.end }; + root = try self.insert(root, &end, chars_right, b.allocator); + sel.end.move_left(root, self.metrics) catch {}; + } else { + root = try self.insert(root, cursel, chars_left, b.allocator); + root = try self.insert(root, cursel, chars_right, b.allocator); + } + cursel.cursor.move_left(root, self.metrics) catch {}; + }; + try self.update_buf(root); + self.clamp(); + } + pub const smart_insert_pair_meta = .{ .arguments = &.{.string} }; + pub fn enable_fast_scroll(self: *Self, _: Context) Result { self.fast_scroll = true; }