From 28e164708e0e174eabb7e7b847914b012bd935fb Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Sun, 9 Feb 2025 19:34:33 +0100 Subject: [PATCH 1/4] feat(project): add `--project` cli parameter closes #172 --- src/main.zig | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main.zig b/src/main.zig index 6ccc4f0..7ae0a2a 100644 --- a/src/main.zig +++ b/src/main.zig @@ -52,6 +52,7 @@ pub fn main() anyerror!void { ; pub const descriptions = .{ + .project = "Set project directory (default: cwd)", .frame_rate = "Set target frame rate (default: 60)", .debug_wait = "Wait for key press before starting UI", .debug_dump_on_error = "Dump stack traces on errors", @@ -74,6 +75,7 @@ pub fn main() anyerror!void { pub const formats = .{ .frame_rate = "num", .trace_level = "num", .exec = "cmds" }; pub const switches = .{ + .project = 'p', .frame_rate = 'f', .trace_level = 't', .language = 'l', @@ -82,6 +84,7 @@ pub fn main() anyerror!void { .version = 'v', }; + project: ?[]const u8, frame_rate: ?usize, debug_wait: bool, debug_dump_on_error: bool, @@ -267,11 +270,15 @@ pub fn main() anyerror!void { var have_project = false; var files = std.ArrayList(Dest).init(a); defer files.deinit(); + if (args.project) |project| { + try tui_proc.send(.{ "cmd", "open_project_dir", .{project} }); + have_project = true; + } for (dests.items) |dest| { if (dest.file.len == 0) continue; if (is_directory(dest.file)) { if (have_project) { - std.debug.print("more than one directory is not allowed\n", .{}); + std.debug.print("more than one project directory is not allowed\n", .{}); exit(1); } try tui_proc.send(.{ "cmd", "open_project_dir", .{dest.file} }); From 90192ddf3c2adb26d91b074d5cfb28589f22cceb Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Sun, 9 Feb 2025 19:53:37 +0100 Subject: [PATCH 2/4] feat(project): indicate that a project is open in the recent projects list --- src/project_manager.zig | 5 ++++- src/tui/mode/overlay/open_recent_project.zig | 13 ++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/project_manager.zig b/src/project_manager.zig index 2712399..01aaf4d 100644 --- a/src/project_manager.zig +++ b/src/project_manager.zig @@ -442,8 +442,11 @@ const Process = struct { var message = std.ArrayList(u8).init(self.allocator); const writer = message.writer(); try cbor.writeArrayHeader(writer, recent_projects.items.len); - for (recent_projects.items) |project| + for (recent_projects.items) |project| { + try cbor.writeArrayHeader(writer, 2); try cbor.writeValue(writer, project.name); + try cbor.writeValue(writer, if (self.projects.get(project.name)) |_| true else false); + } from.send_raw(.{ .buf = message.items }) catch return error.ClientFailed; } diff --git a/src/tui/mode/overlay/open_recent_project.zig b/src/tui/mode/overlay/open_recent_project.zig index ea49b75..5aeea38 100644 --- a/src/tui/mode/overlay/open_recent_project.zig +++ b/src/tui/mode/overlay/open_recent_project.zig @@ -11,6 +11,7 @@ pub const description = "project"; pub const Entry = struct { label: []const u8, + open: bool, }; pub const Match = struct { @@ -31,9 +32,14 @@ pub fn load_entries(palette: *Type) !usize { var len = try cbor.decodeArrayHeader(&iter); while (len > 0) : (len -= 1) { var name_: []const u8 = undefined; - if (try cbor.matchValue(&iter, cbor.extract(&name_))) { - (try palette.entries.addOne()).* = .{ .label = try palette.allocator.dupe(u8, name_) }; - } else return error.InvalidMessageField; + var open: bool = false; + if (try cbor.decodeArrayHeader(&iter) != 2) + return error.InvalidMessageField; + if (!try cbor.matchValue(&iter, cbor.extract(&name_))) + return error.InvalidMessageField; + if (!try cbor.matchValue(&iter, cbor.extract(&open))) + return error.InvalidMessageField; + (try palette.entries.addOne()).* = .{ .label = try palette.allocator.dupe(u8, name_), .open = open }; } return 1; } @@ -43,6 +49,7 @@ pub fn add_menu_entry(palette: *Type, entry: *Entry, matches: ?[]const usize) !v defer value.deinit(); const writer = value.writer(); try cbor.writeValue(writer, entry.label); + try cbor.writeValue(writer, if (entry.open) "-" else ""); try cbor.writeValue(writer, matches orelse &[_]usize{}); try palette.menu.add_item_with_handler(value.items, select); palette.items += 1; From 88ca1cd3436624bf5fe8b9f90c7cfae811d7733b Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Sun, 9 Feb 2025 20:39:32 +0100 Subject: [PATCH 3/4] feat(project): add `close_project` command bound to `del` in recent projects list --- src/project_manager.zig | 17 +++++++++++++++++ src/tui/mainview.zig | 15 +++++++++++++++ src/tui/mode/overlay/open_recent_project.zig | 14 ++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/src/project_manager.zig b/src/project_manager.zig index 01aaf4d..2795012 100644 --- a/src/project_manager.zig +++ b/src/project_manager.zig @@ -64,6 +64,12 @@ pub fn open(rel_project_directory: []const u8) (ProjectManagerError || FileSyste return send(.{ "open", project_directory }); } +pub fn close(project_directory: []const u8) (ProjectManagerError || error{CloseCurrentProject})!void { + const current_project = tp.env.get().str("project"); + if (std.mem.eql(u8, current_project, project_directory)) return error.CloseCurrentProject; + return send(.{ "close", project_directory }); +} + pub fn request_n_most_recent_file(allocator: std.mem.Allocator, n: usize) (CallError || ProjectError || cbor.Error)!?[]const u8 { const project = tp.env.get().str("project"); if (project.len == 0) @@ -339,6 +345,8 @@ const Process = struct { self.logger.print_err("lsp-handling", "child '{s}' terminated", .{path}); } else if (try cbor.match(m.buf, .{ "open", tp.extract(&project_directory) })) { self.open(project_directory) catch |e| return from.forward_error(e, @errorReturnTrace()) catch error.ClientFailed; + } else if (try cbor.match(m.buf, .{ "close", tp.extract(&project_directory) })) { + self.close(project_directory) catch |e| return from.forward_error(e, @errorReturnTrace()) catch error.ClientFailed; } else if (try cbor.match(m.buf, .{ "request_n_most_recent_file", tp.extract(&project_directory), tp.extract(&n) })) { self.request_n_most_recent_file(from, project_directory, n) catch |e| return from.forward_error(e, @errorReturnTrace()) catch error.ClientFailed; } else if (try cbor.match(m.buf, .{ "request_recent_files", tp.extract(&project_directory), tp.extract(&max) })) { @@ -412,6 +420,15 @@ const Process = struct { } } + fn close(self: *Process, project_directory: []const u8) error{}!void { + if (self.projects.fetchRemove(project_directory)) |kv| { + self.allocator.free(kv.key); + kv.value.deinit(); + self.allocator.destroy(kv.value); + self.logger.print("closed: {s}", .{project_directory}); + } + } + fn loaded(self: *Process, project_directory: []const u8) OutOfMemoryError!void { const project = self.projects.get(project_directory) orelse return; try project.merge_pending_files(); diff --git a/src/tui/mainview.zig b/src/tui/mainview.zig index b4d588f..66fd364 100644 --- a/src/tui/mainview.zig +++ b/src/tui/mainview.zig @@ -274,6 +274,21 @@ const cmds = struct { } pub const open_project_dir_meta = .{ .arguments = &.{.string} }; + pub fn close_project(_: *Self, ctx: Ctx) Result { + var project_dir: []const u8 = undefined; + if (!try ctx.args.match(.{tp.extract(&project_dir)})) + return; + project_manager.close(project_dir) catch |e| switch (e) { + error.CloseCurrentProject => { + const logger = log.logger("project"); + defer logger.deinit(); + logger.print_err("project", "cannot close current project", .{}); + }, + else => return e, + }; + } + pub const close_project_meta: Meta = .{ .arguments = &.{.string} }; + pub fn change_project(self: *Self, ctx: Ctx) Result { var project_dir: []const u8 = undefined; if (!try ctx.args.match(.{tp.extract(&project_dir)})) diff --git a/src/tui/mode/overlay/open_recent_project.zig b/src/tui/mode/overlay/open_recent_project.zig index 5aeea38..d9fd219 100644 --- a/src/tui/mode/overlay/open_recent_project.zig +++ b/src/tui/mode/overlay/open_recent_project.zig @@ -2,8 +2,10 @@ const std = @import("std"); const cbor = @import("cbor"); const tp = @import("thespian"); const project_manager = @import("project_manager"); +const command = @import("command"); pub const Type = @import("palette.zig").Create(@This()); +const module_name = @typeName(@This()); pub const label = "Search projects"; pub const name = " project"; @@ -44,6 +46,10 @@ pub fn load_entries(palette: *Type) !usize { return 1; } +pub fn clear_entries(palette: *Type) void { + palette.entries.clearRetainingCapacity(); +} + pub fn add_menu_entry(palette: *Type, entry: *Entry, matches: ?[]const usize) !void { var value = std.ArrayList(u8).init(palette.allocator); defer value.deinit(); @@ -62,3 +68,11 @@ fn select(menu: **Type.MenuState, button: *Type.ButtonState) void { tp.self_pid().send(.{ "cmd", "exit_overlay_mode" }) catch |e| menu.*.opts.ctx.logger.err("open_recent_project", e); tp.self_pid().send(.{ "cmd", "change_project", .{name_} }) catch |e| menu.*.opts.ctx.logger.err("open_recent_project", e); } + +pub fn delete_item(menu: *Type.MenuState, button: *Type.ButtonState) bool { + var name_: []const u8 = undefined; + var iter = button.opts.label; + if (!(cbor.matchString(&iter, &name_) catch false)) return false; + command.executeName("close_project", command.fmt(.{name_})) catch |e| menu.*.opts.ctx.logger.err(module_name, e); + return true; //refresh list +} From 910331868e00938050176deda6288dfda9fc4ff0 Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Sun, 9 Feb 2025 21:40:17 +0100 Subject: [PATCH 4/4] feat(project): add `--no-persist` to prevent new project persisting --- src/Project.zig | 2 ++ src/main.zig | 4 ++++ src/project_manager.zig | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/Project.zig b/src/Project.zig index 798ced0..1a7bd8b 100644 --- a/src/Project.zig +++ b/src/Project.zig @@ -20,6 +20,7 @@ open_time: i64, language_servers: std.StringHashMap(LSP), file_language_server: std.StringHashMap(LSP), tasks: std.ArrayList(Task), +persistent: bool = false, const Self = @This(); @@ -130,6 +131,7 @@ pub fn restore_state(self: *Self, data: []const u8) !void { error.InvalidType => return self.restore_state_v0(data), else => return tp.trace(tp.channel.debug, .{ "restore_state", "unknown format", data }), }; + self.persistent = true; return self.restore_state_v1(data); } diff --git a/src/main.zig b/src/main.zig index 7ae0a2a..acf34d4 100644 --- a/src/main.zig +++ b/src/main.zig @@ -53,6 +53,7 @@ pub fn main() anyerror!void { pub const descriptions = .{ .project = "Set project directory (default: cwd)", + .no_persist = "Do not persist new projects", .frame_rate = "Set target frame rate (default: 60)", .debug_wait = "Wait for key press before starting UI", .debug_dump_on_error = "Dump stack traces on errors", @@ -76,6 +77,7 @@ pub fn main() anyerror!void { pub const switches = .{ .project = 'p', + .no_persist = 'N', .frame_rate = 'f', .trace_level = 't', .language = 'l', @@ -85,6 +87,7 @@ pub fn main() anyerror!void { }; project: ?[]const u8, + no_persist: bool, frame_rate: ?usize, debug_wait: bool, debug_dump_on_error: bool, @@ -202,6 +205,7 @@ pub fn main() anyerror!void { log.set_std_log_pid(log_proc.ref()); defer log.set_std_log_pid(null); + env.set("no-persist", args.no_persist); env.set("restore-session", args.restore_session); env.set("no-alternate", args.no_alternate); env.set("show-input", args.show_input); diff --git a/src/project_manager.zig b/src/project_manager.zig index 2795012..b749397 100644 --- a/src/project_manager.zig +++ b/src/project_manager.zig @@ -423,6 +423,7 @@ const Process = struct { fn close(self: *Process, project_directory: []const u8) error{}!void { if (self.projects.fetchRemove(project_directory)) |kv| { self.allocator.free(kv.key); + self.persist_project(kv.value) catch {}; kv.value.deinit(); self.allocator.destroy(kv.value); self.logger.print("closed: {s}", .{project_directory}); @@ -629,6 +630,8 @@ const Process = struct { } fn persist_project(self: *Process, project: *Project) !void { + const no_persist = tp.env.get().is("no-persist"); + if (no_persist and !project.persistent) return; tp.trace(tp.channel.debug, .{ "persist_project", project.name }); self.logger.print("saving: {s}", .{project.name}); const file_name = try get_project_state_file_path(self.allocator, project);