summaryrefslogtreecommitdiff
path: root/src/builtins_json.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/builtins_json.zig')
-rw-r--r--src/builtins_json.zig22
1 files changed, 6 insertions, 16 deletions
diff --git a/src/builtins_json.zig b/src/builtins_json.zig
index 7f998388..4440130d 100644
--- a/src/builtins_json.zig
+++ b/src/builtins_json.zig
@@ -11,17 +11,7 @@ const builtins = @import("builtins.zig");
const config = @import("config.zig");
const ctl = @import("ninep/ctl.zig");
-fn str(w: *std.Io.Writer, s: []const u8) !void {
- try w.writeByte('"');
- for (s) |c| switch (c) {
- '"' => try w.writeAll("\\\""),
- '\\' => try w.writeAll("\\\\"),
- '\n' => try w.writeAll("\\n"),
- 0...9, 11...0x1f => try w.print("\\u{x:0>4}", .{c}),
- else => try w.writeByte(c),
- };
- try w.writeByte('"');
-}
+const str = std.json.Stringify.encodeJsonString;
const Entry = struct { name: []const u8, row: usize };
@@ -39,7 +29,7 @@ pub fn write(w: *std.Io.Writer) !void {
const b = row.cmd;
const name = @tagName(b);
try w.writeAll(" {\"name\": ");
- try str(w, name);
+ try str(name, .{}, w);
try w.writeAll(", \"leader\": ");
if (row.path) |p| {
try w.writeAll("\"SPC");
@@ -55,21 +45,21 @@ pub fn write(w: *std.Io.Writer) !void {
while (parts.next()) |part| if (part.len > 0) {
if (!first) try w.writeAll(", ");
first = false;
- try str(w, part);
+ try str(part, .{}, w);
};
try w.writeAll("], \"arg\": ");
try w.writeAll(if (builtins.registry.takesArg(b)) "true" else "false");
try w.writeAll(", \"scope\": ");
- try str(w, if (b == .Edit) "both" else if (builtins.registry.scope(b) == .session) "root" else "pane");
+ try str(if (b == .Edit) "both" else if (builtins.registry.scope(b) == .session) "root" else "pane", .{}, w);
const setting = config.Runtime.find(name);
try w.writeAll(", \"setting\": ");
try w.writeAll(if (setting != null) "true" else "false");
try w.writeAll(", \"choices\": ");
- if (setting) |s| if (config.Runtime.choices(s.action)) |v| try str(w, v) else try w.writeAll("null") else try w.writeAll("null");
+ if (setting) |s| if (config.Runtime.choices(s.action)) |v| try str(v, .{}, w) else try w.writeAll("null") else try w.writeAll("null");
var buf: [2048]u8 = undefined;
const doc = if (setting) |s| s.doc else ctl.summaryOf(name, &buf);
try w.writeAll(", \"doc\": ");
- try str(w, doc);
+ try str(doc, .{}, w);
try w.writeAll(if (n + 1 < order.len) "},\n" else "}\n");
}
try w.writeAll("]\n");