feat: add fuzzy search file completion in open_file command

closes #30
This commit is contained in:
CJ van den Berg 2024-08-26 21:45:21 +02:00
parent da7a2d2330
commit f1e3165dc3
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9

View file

@ -1,27 +1,35 @@
const std = @import("std"); const std = @import("std");
const tp = @import("thespian"); const tp = @import("thespian");
const log = @import("log");
const key = @import("renderer").input.key; const key = @import("renderer").input.key;
const mod = @import("renderer").input.modifier; const mod = @import("renderer").input.modifier;
const event_type = @import("renderer").input.event_type; const event_type = @import("renderer").input.event_type;
const ucs32_to_utf8 = @import("renderer").ucs32_to_utf8; const ucs32_to_utf8 = @import("renderer").ucs32_to_utf8;
const project_manager = @import("project_manager");
const tui = @import("../../tui.zig"); const tui = @import("../../tui.zig");
const mainview = @import("../../mainview.zig"); const mainview = @import("../../mainview.zig");
const command = @import("../../command.zig"); const command = @import("../../command.zig");
const EventHandler = @import("../../EventHandler.zig"); const EventHandler = @import("../../EventHandler.zig");
const MessageFilter = @import("../../MessageFilter.zig");
const Self = @This(); const Self = @This();
a: std.mem.Allocator, a: std.mem.Allocator,
file_path: std.ArrayList(u8), file_path: std.ArrayList(u8),
query: std.ArrayList(u8),
query_pending: bool = false,
complete_trigger_count: usize = 0,
pub fn create(a: std.mem.Allocator, _: command.Context) !*Self { pub fn create(a: std.mem.Allocator, _: command.Context) !*Self {
const self: *Self = try a.create(Self); const self: *Self = try a.create(Self);
self.* = .{ self.* = .{
.a = a, .a = a,
.file_path = std.ArrayList(u8).init(a), .file_path = std.ArrayList(u8).init(a),
.query = std.ArrayList(u8).init(a),
}; };
try tui.current().message_filters.add(MessageFilter.bind(self, receive_project_manager));
if (tui.current().mainview.dynamic_cast(mainview)) |mv_| if (mv_.get_editor()) |editor| { if (tui.current().mainview.dynamic_cast(mainview)) |mv_| if (mv_.get_editor()) |editor| {
if (editor.is_dirty()) return tp.exit("unsaved changes"); if (editor.is_dirty()) return tp.exit("unsaved changes");
if (editor.file_path) |old_path| if (editor.file_path) |old_path|
@ -39,6 +47,8 @@ pub fn create(a: std.mem.Allocator, _: command.Context) !*Self {
} }
pub fn deinit(self: *Self) void { pub fn deinit(self: *Self) void {
tui.current().message_filters.remove_ptr(self);
self.query.deinit();
self.file_path.deinit(); self.file_path.deinit();
self.a.destroy(self); self.a.destroy(self);
} }
@ -108,9 +118,11 @@ fn mapPress(self: *Self, keypress: u32, egc: u32, modifiers: u32) !void {
else {}, else {},
}, },
0 => switch (keypress) { 0 => switch (keypress) {
key.TAB => self.try_complete_file(),
key.ESC => self.cancel(), key.ESC => self.cancel(),
key.ENTER => self.navigate(), key.ENTER => self.navigate(),
key.BACKSPACE => if (self.file_path.items.len > 0) { key.BACKSPACE => if (self.file_path.items.len > 0) {
self.complete_trigger_count = 0;
self.file_path.shrinkRetainingCapacity(self.file_path.items.len - 1); self.file_path.shrinkRetainingCapacity(self.file_path.items.len - 1);
}, },
else => if (!key.synthesized_p(keypress)) else => if (!key.synthesized_p(keypress))
@ -124,16 +136,19 @@ fn mapPress(self: *Self, keypress: u32, egc: u32, modifiers: u32) !void {
fn mapRelease(_: *Self, _: u32, _: u32, _: u32) !void {} fn mapRelease(_: *Self, _: u32, _: u32, _: u32) !void {}
fn insert_code_point(self: *Self, c: u32) !void { fn insert_code_point(self: *Self, c: u32) !void {
self.complete_trigger_count = 0;
var buf: [32]u8 = undefined; var buf: [32]u8 = undefined;
const bytes = try ucs32_to_utf8(&[_]u32{c}, &buf); const bytes = try ucs32_to_utf8(&[_]u32{c}, &buf);
try self.file_path.appendSlice(buf[0..bytes]); try self.file_path.appendSlice(buf[0..bytes]);
} }
fn insert_bytes(self: *Self, bytes: []const u8) !void { fn insert_bytes(self: *Self, bytes: []const u8) !void {
self.complete_trigger_count = 0;
try self.file_path.appendSlice(bytes); try self.file_path.appendSlice(bytes);
} }
fn cmd(_: *Self, name_: []const u8, ctx: command.Context) tp.result { fn cmd(self: *Self, name_: []const u8, ctx: command.Context) tp.result {
self.complete_trigger_count = 0;
return command.executeName(name_, ctx); return command.executeName(name_, ctx);
} }
@ -146,3 +161,48 @@ fn navigate(self: *Self) void {
tp.self_pid().send(.{ "cmd", "navigate", .{ .file = self.file_path.items } }) catch {}; tp.self_pid().send(.{ "cmd", "navigate", .{ .file = self.file_path.items } }) catch {};
command.executeName("exit_mini_mode", .{}) catch {}; command.executeName("exit_mini_mode", .{}) catch {};
} }
fn try_complete_file(self: *Self) !void {
self.complete_trigger_count += 1;
if (self.complete_trigger_count == 1) {
self.query.clearRetainingCapacity();
try self.query.appendSlice(self.file_path.items);
}
if (self.query_pending) return;
self.query_pending = true;
try project_manager.query_recent_files(self.complete_trigger_count, self.query.items);
}
fn receive_project_manager(self: *Self, _: tp.pid_ref, m: tp.message) error{Exit}!bool {
if (try m.match(.{ "PRJ", tp.more })) {
self.process_project_manager(m) catch |e| return tp.exit_error(e, @errorReturnTrace());
return true;
}
return false;
}
fn process_project_manager(self: *Self, m: tp.message) !void {
defer {
if (tui.current().mini_mode) |*mini_mode| {
mini_mode.text = self.file_path.items;
mini_mode.cursor = self.file_path.items.len;
}
}
var file_name: []const u8 = undefined;
var query: []const u8 = undefined;
if (try m.match(.{ "PRJ", "recent", tp.any, tp.extract(&file_name), tp.any })) {
self.file_path.clearRetainingCapacity();
try self.file_path.appendSlice(file_name);
tui.need_render();
} else if (try m.match(.{ "PRJ", "recent", tp.any, tp.extract(&file_name) })) {
self.file_path.clearRetainingCapacity();
try self.file_path.appendSlice(file_name);
tui.need_render();
} else if (try m.match(.{ "PRJ", "recent_done", tp.any, tp.extract(&query) })) {
self.query_pending = false;
if (!std.mem.eql(u8, self.query.items, query))
try self.try_complete_file();
} else {
log.logger("open_recent").err("receive", tp.unexpected(m));
}
}