1 files changed, 38 insertions, 1 deletions
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index 902a9647..bc27f72b 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -554,7 +554,9 @@ pub fn writeSettingsOf(p: *Pardes, s: *const config.Runtime, w: *std.Io.Writer)
         const word = setting.word;
         switch (setting.action) {
             .toggle => |field| try w.print("{s} {s}\n", .{ word, if (@field(s, @tagName(field))) "on" else "off" }),
-            .theme => try w.print("{s} {s}\n", .{ word, if (s == &p.settings) p.theme().name else pardes.themes[s.theme].name }),
+            .theme => if (s == &p.settings) {
+                if (pardes.colors.loadedThemeFile(p)) |path| try w.print("ThemeFile {s}\n", .{path}) else try w.print("{s} {s}\n", .{ word, p.theme().name });
+            } else try w.print("{s} {s}\n", .{ word, pardes.themes[s.theme].name }),
             .shell => {
                 const chosen = s.shell.requested.get();
                 try w.print("{s} {s}\n", .{ word, if (chosen.len > 0) chosen else config.defaultShell() });
@@ -1829,6 +1831,41 @@ test "an error's words give the errno a mount reads: EINVAL for what is malforme
     }
 }
 
+test "after a ThemeFile the root ctl and DumpConfig say ThemeFile and its path, which writes back" {
+    if (comptime !pardes.hosted) return;
+    const gpa = testing.allocator;
+    const p = try withFile(gpa, "x\n");
+    defer p.deinit();
+    const root_ctl = @intFromEnum(tree.TopFile.ctl);
+    const path = "/tmp/pardes-mine-theme.zon";
+    try testing.expectEqual(Status.ok, wr(p, root_ctl, "ThemeFile " ++ path ++ "\n").reply.status);
+    var custom = pardes.themes[0];
+    custom.name = "mine";
+    var encoded: std.Io.Writer.Allocating = .init(gpa);
+    defer encoded.deinit();
+    try std.zon.stringify.serialize(custom, .{}, &encoded.writer);
+    try testing.expect(pardes.colors.loadThemeFile(p, p.theme_file_generation, encoded.written(), false));
+    const settings = rd(p, root_ctl, 0, 1 << 16).bytes;
+    try testing.expect(std.mem.indexOf(u8, settings, "ThemeFile " ++ path ++ "\n") != null);
+    try testing.expect(std.mem.indexOf(u8, settings, "Theme mine") == null);
+    var storage: [16384]u8 = undefined;
+    var out: std.Io.Writer = .fixed(&storage);
+    try config.Runtime.writeReport(&out, .{
+        .startup_config_path = null,
+        .platform = @tagName(pardes.platform),
+        .theme_name = p.theme().name,
+        .theme_file = pardes.colors.loadedThemeFile(p),
+        .compiled_default_shell = config.defaultShell(),
+        .hover_delay_frames = null,
+        .native_images = false,
+        .capabilities = builtins.capabilities,
+        .state = &p.settings,
+    });
+    try testing.expect(std.mem.indexOf(u8, out.buffered(), "ThemeFile " ++ path ++ "\n") != null);
+    // Written back, it is the same request again, not "no theme mine".
+    try testing.expectEqual(Status.ok, wr(p, root_ctl, "ThemeFile " ++ path ++ "\n").reply.status);
+}
+
 test "Joincol with no column to the right and Theme with no such theme say so" {
     const gpa = testing.allocator;
     const p = try withFile(gpa, "x\n");