From bd27db46d17ecb012b2209c86a6aff365158310b Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Mon, 19 Aug 2024 22:44:57 +0200 Subject: [PATCH] feat: open most recent file on project switch --- src/Project.zig | 5 +++++ src/project_manager.zig | 18 ++++++++++++++++++ src/tui/mainview.zig | 4 ++++ 3 files changed, 27 insertions(+) diff --git a/src/Project.zig b/src/Project.zig index 1a4d726..9c3a1bc 100644 --- a/src/Project.zig +++ b/src/Project.zig @@ -140,6 +140,11 @@ pub fn sort_files_by_mtime(self: *Self) void { std.mem.sort(File, self.files.items, {}, less_fn); } +pub fn request_most_recent_file(self: *Self, from: tp.pid_ref) error{ OutOfMemory, Exit }!void { + const file_path = if (self.files.items.len > 0) self.files.items[0].path else null; + try from.send(.{file_path}); +} + pub fn request_recent_files(self: *Self, from: tp.pid_ref, max: usize) error{ OutOfMemory, Exit }!void { defer from.send(.{ "PRJ", "recent_done", self.longest_file_path, "" }) catch {}; for (self.files.items, 0..) |file, i| { diff --git a/src/project_manager.zig b/src/project_manager.zig index 94f89c3..e02b5bb 100644 --- a/src/project_manager.zig +++ b/src/project_manager.zig @@ -45,6 +45,16 @@ pub fn open(rel_project_directory: []const u8) !void { return (try get()).pid.send(.{ "open", project_directory }); } +pub fn request_most_recent_file(a: std.mem.Allocator) !?[]const u8 { + const project = tp.env.get().str("project"); + if (project.len == 0) + return tp.exit("No project"); + const rsp = try (try get()).pid.call(a, request_timeout, .{ "request_most_recent_file", project }); + defer a.free(rsp.buf); + var file_path: []const u8 = undefined; + return if (try rsp.match(.{tp.extract(&file_path)})) try a.dupe(u8, file_path) else null; +} + pub fn request_recent_files(max: usize) !void { const project = tp.env.get().str("project"); if (project.len == 0) @@ -225,6 +235,8 @@ const Process = struct { self.logger.print_err("lsp-handling", "child '{s}' terminated", .{path}); } else if (try m.match(.{ "open", tp.extract(&project_directory) })) { self.open(project_directory) catch |e| return from.forward_error(e, @errorReturnTrace()); + } else if (try m.match(.{ "request_most_recent_file", tp.extract(&project_directory) })) { + self.request_most_recent_file(from, project_directory) catch |e| return from.forward_error(e, @errorReturnTrace()); } else if (try m.match(.{ "request_recent_files", tp.extract(&project_directory), tp.extract(&max) })) { self.request_recent_files(from, project_directory, max) catch |e| return from.forward_error(e, @errorReturnTrace()); } else if (try m.match(.{ "request_recent_projects", tp.extract(&project_directory) })) { @@ -286,6 +298,12 @@ const Process = struct { }); } + fn request_most_recent_file(self: *Process, from: tp.pid_ref, project_directory: []const u8) error{ OutOfMemory, Exit }!void { + const project = if (self.projects.get(project_directory)) |p| p else return tp.exit("No project"); + project.sort_files_by_mtime(); + return project.request_most_recent_file(from); + } + fn request_recent_files(self: *Process, from: tp.pid_ref, project_directory: []const u8, max: usize) error{ OutOfMemory, Exit }!void { const project = if (self.projects.get(project_directory)) |p| p else return tp.exit("No project"); project.sort_files_by_mtime(); diff --git a/src/tui/mainview.zig b/src/tui/mainview.zig index ac1d6c3..c55e452 100644 --- a/src/tui/mainview.zig +++ b/src/tui/mainview.zig @@ -258,6 +258,10 @@ const cmds = struct { const project = tp.env.get().str("project"); tui.current().rdr.set_terminal_working_directory(project); _ = try self.statusbar.msg(.{ "PRJ", "open" }); + if (try project_manager.request_most_recent_file(self.a)) |file_path| { + defer self.a.free(file_path); + try tp.self_pid().send(.{ "cmd", "navigate", .{ .file = file_path } }); + } } pub fn navigate(self: *Self, ctx: Ctx) Result {