From b4106873392ddc9af120e1cc7adf7fd7257e522c Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Wed, 26 Mar 2025 12:21:54 +0100 Subject: [PATCH] feat: close results pane if find_in_files mode is cancelled --- src/keybind/builtin/flow.json | 2 +- src/tui/mainview.zig | 6 ++++++ src/tui/mode/mini/find_in_files.zig | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/keybind/builtin/flow.json b/src/keybind/builtin/flow.json index 38befc3..24effd9 100644 --- a/src/keybind/builtin/flow.json +++ b/src/keybind/builtin/flow.json @@ -387,7 +387,7 @@ ["f15", "goto_prev_match"], ["f9", "theme_prev"], ["f10", "theme_next"], - ["escape", "exit_mini_mode"], + ["escape", "mini_mode_cancel"], ["enter", "mini_mode_select"], ["backspace", "mini_mode_delete_backwards"] ] diff --git a/src/tui/mainview.zig b/src/tui/mainview.zig index 0a5bb94..7d68dcb 100644 --- a/src/tui/mainview.zig +++ b/src/tui/mainview.zig @@ -597,6 +597,12 @@ const cmds = struct { } pub const show_inspector_view_meta: Meta = .{}; + pub fn close_find_in_files_results(self: *Self, _: Ctx) Result { + if (self.file_list_type == .find_in_files and self.is_panel_view_showing(filelist_view)) + try self.toggle_panel_view(filelist_view, false); + } + pub const close_find_in_files_results_meta: Meta = .{ .description = "Close find in files results view" }; + pub fn jump_back(self: *Self, _: Ctx) Result { try self.location_history_.back(location_jump); } diff --git a/src/tui/mode/mini/find_in_files.zig b/src/tui/mode/mini/find_in_files.zig index 348c5d4..9704f03 100644 --- a/src/tui/mode/mini/find_in_files.zig +++ b/src/tui/mode/mini/find_in_files.zig @@ -100,6 +100,7 @@ const cmds = struct { pub const mini_mode_reset_meta: Meta = .{ .description = "Clear input" }; pub fn mini_mode_cancel(_: *Self, _: Ctx) Result { + command.executeName("close_find_in_files_results", .{}) catch {}; command.executeName("exit_mini_mode", .{}) catch {}; } pub const mini_mode_cancel_meta: Meta = .{ .description = "Cancel input" };