From 71a821aad6304ce7593b7381fa33d10759ed792b Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Sun, 1 Dec 2024 23:28:11 +0100 Subject: [PATCH] refactor: rename keybind inherit setting --- src/keybind/builtin/helix.json | 2 +- src/keybind/keybind.zig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/keybind/builtin/helix.json b/src/keybind/builtin/helix.json index d9b0c0d..b383d2c 100644 --- a/src/keybind/builtin/helix.json +++ b/src/keybind/builtin/helix.json @@ -2,7 +2,7 @@ "settings": { "init_command": ["enter_helix_mode"], "deinit_command": ["exit_helix_mode"], - "fallback": "vim" + "inherit": "vim" }, "normal": { "syntax": "vim", diff --git a/src/keybind/keybind.zig b/src/keybind/keybind.zig index 7a5727f..5e199f1 100644 --- a/src/keybind/keybind.zig +++ b/src/keybind/keybind.zig @@ -206,13 +206,13 @@ const Namespace = struct { const JsonSettings = struct { init_command: ?[]const std.json.Value = null, deinit_command: ?[]const std.json.Value = null, - fallback: ?[]const u8 = null, + inherit: ?[]const u8 = null, }; const parsed = try std.json.parseFromValue(JsonSettings, allocator, settings_value, .{ .ignore_unknown_fields = true, }); defer parsed.deinit(); - self.fallback = if (parsed.value.fallback) |fallback| try get_or_load_namespace(fallback) else null; + self.fallback = if (parsed.value.inherit) |fallback| try get_or_load_namespace(fallback) else null; if (parsed.value.init_command) |cmd| self.init_command = try Command.load(allocator, cmd); if (parsed.value.deinit_command) |cmd| self.deinit_command = try Command.load(allocator, cmd); }