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

fix: hx use explicit mode on match brackets

Browse source 
to cases where mode renaming could potentially give unexpected
behaviour.

Reverting 891a445ed43590f3a40b4058786a1405d6e2f077.
This commit is contained in:
Igor Támara 2025-11-18 07:53:42 -05:00 • committed by CJ van den Berg
parent 294e30f8ee
commit 7ae983a419
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/keybind/builtin/helix.json
View file

@ -465,7 +465,7 @@
["x", "extend_line_below"],
["m m", "match_brackets"],
["m m", "match_brackets", "helix_sel_mode"],
["m a", "match", "select_textobject_around"],
["m i", "match", "select_textobject_inner"],
["m d", "match", "surround_delete"],

7
src/tui/mode/helix.zig
View file

@ -209,12 +209,11 @@ const cmds_ = struct {
}
pub const split_selection_on_newline_meta: Meta = .{ .description = "Add cursor to each line in selection helix" };
pub fn match_brackets(_: *void, _: Ctx) Result {
pub fn match_brackets(_: *void, ctx: Ctx) Result {
const mv = tui.mainview() orelse return;
const ed = mv.get_active_editor() orelse return;
const root = ed.buf_root() catch return;
const m = tui.input_mode().?.*.name;
try ed.with_cursels_const_once_arg(root, &match_bracket, command.fmt(.{m}));
try ed.with_cursels_const_once_arg(root, &match_bracket, ctx);
ed.clamp();
}
pub const match_brackets_meta: Meta = .{ .description = "Goto matching bracket" };
@ -494,7 +493,7 @@ const cmds_ = struct {
fn match_bracket(root: Buffer.Root, cursel: *CurSel, ctx: command.Context, metrics: Buffer.Metrics) error{Stop}!void {
var symbol: []const u8 = undefined;
const mode: enum { helix_sel_mode, helix_nor_mode } = if ((ctx.args.match(.{tp.extract(&symbol)}) catch false) and
std.mem.eql(u8, "SEL", symbol)) .helix_sel_mode else .helix_nor_mode;
std.mem.eql(u8, @tagName(.helix_sel_mode), symbol)) .helix_sel_mode else .helix_nor_mode;
if (mode == .helix_sel_mode) {
const begin: Cursor = if (cursel.selection) |sel| sel.begin else cursel.*.cursor;