summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-11-04 23:08:29 -0300
committerGabriel Schneider <[email protected]>2026-11-05 01:16:28 -0300
commit090e9acdb744fdb8d6c7efcee41da74fcf7c542c (patch)
tree4cebd7d1151bb7e2e878faa6ccb46b325c3bac9c /src
parenta6554511da894afb91169fce9af84511b5e60504 (diff)
downloadpardes-090e9acdb744fdb8d6c7efcee41da74fcf7c542c.tar.gz
pardes-090e9acdb744fdb8d6c7efcee41da74fcf7c542c.zip
modal, normal: the twelve prefix roles take config.zig's names (goto_prefix, find_char_fwd, register_prefix...), so normalInput reads every binding by the role's own name and roleBindingName, which mapped the twelve, goes
Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
Diffstat (limited to 'src')
-rw-r--r--src/modal.zig68
-rw-r--r--src/normal.zig20
2 files changed, 35 insertions, 53 deletions
diff --git a/src/modal.zig b/src/modal.zig
index e123d468..71a9ddcb 100644
--- a/src/modal.zig
+++ b/src/modal.zig
@@ -5,18 +5,18 @@ pub const Normal = struct {
pub const Role = enum {
escape,
- prefix_goto,
- prefix_view,
- prefix_match,
- prefix_find_fwd,
- prefix_find_back,
- prefix_till_fwd,
- prefix_till_back,
- prefix_replace,
- prefix_next,
- prefix_prev,
- prefix_register,
- prefix_view_sticky,
+ goto_prefix,
+ view_prefix,
+ match_prefix,
+ find_char_fwd,
+ find_char_back,
+ till_char_fwd,
+ till_char_back,
+ replace_prefix,
+ next_prefix,
+ prev_prefix,
+ register_prefix,
+ view_prefix_sticky,
goto_file_start,
goto_last_line,
@@ -490,7 +490,7 @@ pub const Normal = struct {
},
.match => {
if (state.match_sub == .none) {
- if (key.has(.prefix_match)) {
+ if (key.has(.match_prefix)) {
state.prefix = .none;
return resultAction(.match_bracket);
}
@@ -554,21 +554,21 @@ pub const Normal = struct {
}
// Prefix setters retain the count for their continuation.
- if (key.has(.prefix_goto)) return armPrefix(state, .goto, if (counted.explicit) count else 0);
- if (key.has(.prefix_view)) return armPrefix(state, .view, if (counted.explicit) count else 0);
- if (key.has(.prefix_view_sticky)) {
+ if (key.has(.goto_prefix)) return armPrefix(state, .goto, if (counted.explicit) count else 0);
+ if (key.has(.view_prefix)) return armPrefix(state, .view, if (counted.explicit) count else 0);
+ if (key.has(.view_prefix_sticky)) {
state.sticky = true;
return armPrefix(state, .view, 0);
}
- if (key.has(.prefix_find_fwd)) return armPrefix(state, .find_fwd, if (counted.explicit) count else 0);
- if (key.has(.prefix_find_back)) return armPrefix(state, .find_back, if (counted.explicit) count else 0);
- if (key.has(.prefix_till_fwd)) return armPrefix(state, .till_fwd, if (counted.explicit) count else 0);
- if (key.has(.prefix_till_back)) return armPrefix(state, .till_back, if (counted.explicit) count else 0);
- if (key.has(.prefix_replace)) return armPrefix(state, .replace, if (counted.explicit) count else 0);
- if (key.has(.prefix_next)) return armPrefix(state, .next, if (counted.explicit) count else 0);
- if (key.has(.prefix_prev)) return armPrefix(state, .prev, if (counted.explicit) count else 0);
- if (key.has(.prefix_match)) return armPrefix(state, .match, 0);
- if (key.has(.prefix_register)) return armPrefix(state, .register, if (counted.explicit) count else 0);
+ if (key.has(.find_char_fwd)) return armPrefix(state, .find_fwd, if (counted.explicit) count else 0);
+ if (key.has(.find_char_back)) return armPrefix(state, .find_back, if (counted.explicit) count else 0);
+ if (key.has(.till_char_fwd)) return armPrefix(state, .till_fwd, if (counted.explicit) count else 0);
+ if (key.has(.till_char_back)) return armPrefix(state, .till_back, if (counted.explicit) count else 0);
+ if (key.has(.replace_prefix)) return armPrefix(state, .replace, if (counted.explicit) count else 0);
+ if (key.has(.next_prefix)) return armPrefix(state, .next, if (counted.explicit) count else 0);
+ if (key.has(.prev_prefix)) return armPrefix(state, .prev, if (counted.explicit) count else 0);
+ if (key.has(.match_prefix)) return armPrefix(state, .match, 0);
+ if (key.has(.register_prefix)) return armPrefix(state, .register, if (counted.explicit) count else 0);
if (key.has(.move_left)) return resultAction(.{ .move = .{ .motion = .left, .count = count } });
if (key.has(.move_right)) return resultAction(.{ .move = .{ .motion = .right, .count = count } });
@@ -672,7 +672,7 @@ pub const Normal = struct {
const sequence = [_]Input{
input('1', &.{}),
input('2', &.{}),
- input('g', &.{ .prefix_goto, .goto_file_start }),
+ input('g', &.{ .goto_prefix, .goto_file_start }),
input('j', &.{ .move_down, .goto_line_down, .view_scroll_down }),
};
for (sequence[0 .. sequence.len - 1]) |key| {
@@ -693,7 +693,7 @@ pub const Normal = struct {
test "invalid continuations are ignored and clear prefix plus count" {
var state: State = .{};
try std.testing.expectEqual(Result.pending, parse(&state, input('4', &.{})));
- try std.testing.expectEqual(Result.pending, parse(&state, input('g', &.{.prefix_goto})));
+ try std.testing.expectEqual(Result.pending, parse(&state, input('g', &.{.goto_prefix})));
try std.testing.expectEqual(Result.ignored, parse(&state, input('?', &.{})));
try std.testing.expectEqual(State{}, state);
try std.testing.expectEqualDeep(Result{ .action = .{ .move = .{ .motion = .down, .count = 1 } } }, parse(&state, input('j', &.{.move_down})));
@@ -701,29 +701,29 @@ pub const Normal = struct {
test "literal arguments retain conflicting command characters" {
var state: State = .{};
- try std.testing.expectEqual(Result.pending, parse(&state, input('f', &.{.prefix_find_fwd})));
+ try std.testing.expectEqual(Result.pending, parse(&state, input('f', &.{.find_char_fwd})));
try std.testing.expectEqualDeep(Result{ .action = .{ .find = .{ .kind = .forward, .char = 'p', .count = 1 } } }, parse(&state, input('p', &.{.paste_after})));
- try std.testing.expectEqual(Result.pending, parse(&state, input('m', &.{.prefix_match})));
+ try std.testing.expectEqual(Result.pending, parse(&state, input('m', &.{.match_prefix})));
try std.testing.expectEqual(Result.pending, parse(&state, input('r', &.{.surround_replace})));
- try std.testing.expectEqual(Result.pending, parse(&state, input('[', &.{.prefix_prev})));
- try std.testing.expectEqualDeep(Result{ .action = .{ .surround_replace = .{ .from = '[', .to = ']' } } }, parse(&state, input(']', &.{.prefix_next})));
+ try std.testing.expectEqual(Result.pending, parse(&state, input('[', &.{.prev_prefix})));
+ try std.testing.expectEqualDeep(Result{ .action = .{ .surround_replace = .{ .from = '[', .to = ']' } } }, parse(&state, input(']', &.{.next_prefix})));
try std.testing.expectEqual(State{}, state);
}
test "modified and special keys cannot satisfy literal continuations" {
var state: State = .{};
- _ = parse(&state, input('r', &.{.prefix_replace}));
+ _ = parse(&state, input('r', &.{.replace_prefix}));
try std.testing.expectEqual(Result.ignored, parse(&state, .{ .cp = 'x', .ctrl = true }));
try std.testing.expectEqual(State{}, state);
- _ = parse(&state, input('f', &.{.prefix_find_fwd}));
+ _ = parse(&state, input('f', &.{.find_char_fwd}));
try std.testing.expectEqual(Result.ignored, parse(&state, .{ .cp = 0xF0001 }));
try std.testing.expectEqual(State{}, state);
}
test "replace accepts a Unicode literal" {
var state: State = .{};
- try std.testing.expectEqual(Result.pending, parse(&state, input('r', &.{.prefix_replace})));
+ try std.testing.expectEqual(Result.pending, parse(&state, input('r', &.{.replace_prefix})));
try std.testing.expectEqualDeep(Result{ .action = .{ .replace_char = '界' } }, parse(&state, input('界', &.{})));
try std.testing.expectEqual(State{}, state);
}
diff --git a/src/normal.zig b/src/normal.zig
index 986a8116..48bbe915 100644
--- a/src/normal.zig
+++ b/src/normal.zig
@@ -25,24 +25,6 @@ fn isPrefix(key: Key, cp: u21) bool {
return key.cp == cp and !key.ctrl and !key.alt;
}
-fn roleBindingName(comptime role: modal.Normal.Role) []const u8 {
- return switch (role) {
- .prefix_goto => "goto_prefix",
- .prefix_view => "view_prefix",
- .prefix_view_sticky => "view_prefix_sticky",
- .prefix_match => "match_prefix",
- .prefix_find_fwd => "find_char_fwd",
- .prefix_find_back => "find_char_back",
- .prefix_till_fwd => "till_char_fwd",
- .prefix_till_back => "till_char_back",
- .prefix_replace => "replace_prefix",
- .prefix_next => "next_prefix",
- .prefix_prev => "prev_prefix",
- .prefix_register => "register_prefix",
- else => @tagName(role),
- };
-}
-
fn normalInput(key: Key) modal.Normal.Input {
var out: modal.Normal.Input = .{
.cp = key.cp,
@@ -50,7 +32,7 @@ fn normalInput(key: Key) modal.Normal.Input {
.alt = key.alt,
};
inline for (std.enums.values(modal.Normal.Role)) |role| {
- const name = comptime roleBindingName(role);
+ const name = @tagName(role);
if (!@hasDecl(config, name))
@compileError("normal input role has no config binding: " ++ name);
const binding = @field(config, name);