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

feat: improve smart_insert_pair and add smart_insert_pair_close

Browse source
This commit is contained in:
CJ van den Berg 2025-03-04 19:06:51 +01:00
parent 67c386d5b7
commit e34aed4a95
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 57 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/keybind/builtin/flow.json
View file

@ -164,12 +164,19 @@
["\"", "smart_insert_pair", "\"", "\""], ["\"", "smart_insert_pair", "\"", "\""],
["'", "smart_insert_pair", "'", "'"], ["'", "smart_insert_pair", "'", "'"],
["(", "smart_insert_pair", "(", ")"], ["(", "smart_insert_pair", "(", ")"],
[")", "smart_insert_pair_close", "(", ")"],
["[", "smart_insert_pair", "[", "]"], ["[", "smart_insert_pair", "[", "]"],
["]", "smart_insert_pair_close", "[", "]"],
["{", "smart_insert_pair", "{", "}"], ["{", "smart_insert_pair", "{", "}"],
["}", "smart_insert_pair_close", "{", "}"],
["‘", "smart_insert_pair", "‘", "’"], ["‘", "smart_insert_pair", "‘", "’"],
["’", "smart_insert_pair_close", "‘", "’"],
["“", "smart_insert_pair", "“", "”"], ["“", "smart_insert_pair", "“", "”"],
["”", "smart_insert_pair_close", "“", "”"],
["‚", "smart_insert_pair", "‚", "‘"], ["‚", "smart_insert_pair", "‚", "‘"],
["‘", "smart_insert_pair_close", "‚", "‘"],
["«", "smart_insert_pair", "«", "»"], ["«", "smart_insert_pair", "«", "»"],
["»", "smart_insert_pair_close", "«", "»"],
["left_control", "enable_jump_mode"], ["left_control", "enable_jump_mode"],
["right_control", "enable_jump_mode"], ["right_control", "enable_jump_mode"],

49
src/tui/editor.zig
View file

@ -4069,6 +4069,7 @@ pub const Editor = struct {
if (!try ctx.args.match(.{ tp.extract(&chars_left), tp.extract(&chars_right) })) if (!try ctx.args.match(.{ tp.extract(&chars_left), tp.extract(&chars_right) }))
return error.InvalidSmartInsertPairArguments; return error.InvalidSmartInsertPairArguments;
const b = try self.buf_for_update(); const b = try self.buf_for_update();
var move: enum { left, right } = .left;
var root = b.root; var root = b.root;
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| { for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| {
if (cursel.selection) |*sel| { if (cursel.selection) |*sel| {
@ -4077,16 +4078,60 @@ pub const Editor = struct {
var end: CurSel = .{ .cursor = sel.end }; var end: CurSel = .{ .cursor = sel.end };
root = try self.insert(root, &end, chars_right, b.allocator); root = try self.insert(root, &end, chars_right, b.allocator);
sel.end.move_left(root, self.metrics) catch {}; sel.end.move_left(root, self.metrics) catch {};
} else blk: {
const egc, _, _ = cursel.cursor.egc_at(root, self.metrics) catch {
root = try self.insert(root, cursel, chars_left, b.allocator);
root = try self.insert(root, cursel, chars_right, b.allocator);
break :blk;
};
if (std.mem.eql(u8, egc, chars_left)) {
move = .right;
} else { } else {
root = try self.insert(root, cursel, chars_left, b.allocator); root = try self.insert(root, cursel, chars_left, b.allocator);
root = try self.insert(root, cursel, chars_right, b.allocator); root = try self.insert(root, cursel, chars_right, b.allocator);
} }
cursel.cursor.move_left(root, self.metrics) catch {}; }
switch (move) {
.left => cursel.cursor.move_left(root, self.metrics) catch {},
.right => cursel.cursor.move_right(root, self.metrics) catch {},
}
}; };
try self.update_buf(root); try self.update_buf(root);
self.clamp(); self.clamp();
} }
pub const smart_insert_pair_meta = .{ .arguments = &.{.string} }; pub const smart_insert_pair_meta = .{ .arguments = &.{ .string, .string } };
pub fn smart_insert_pair_close(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.begin.move_left(root, self.metrics) catch {};
cursel.disable_selection(root, self.metrics);
} else blk: {
const egc, _, _ = cursel.cursor.egc_at(root, self.metrics) catch {
root = try self.insert(root, cursel, chars_right, b.allocator);
break :blk;
};
if (std.mem.eql(u8, egc, chars_right)) {
cursel.cursor.move_right(root, self.metrics) catch {};
} else {
root = try self.insert(root, cursel, chars_right, b.allocator);
}
}
};
try self.update_buf(root);
self.clamp();
}
pub const smart_insert_pair_close_meta = .{ .arguments = &.{ .string, .string } };
pub fn enable_fast_scroll(self: *Self, _: Context) Result { pub fn enable_fast_scroll(self: *Self, _: Context) Result {
self.fast_scroll = true; self.fast_scroll = true;