@@ -15,28 +15,27 @@ fn callHead(a: std.mem.Allocator, name: []const u8) []const u8 {
1515 return styles.teal(a, std.fmt.allocPrint(a, "-> {s}", .{name}) catch "->");
1616 }
1717
18+fn spaces(a: std.mem.Allocator, n: usize) []const u8 {
19+ const buf = a.alloc(u8, n) catch return "";
20+ @memset(buf, ' ');
21+ return buf;
22+}
23+
1824 pub fn callRows(a: std.mem.Allocator, call: PendingCall, running: bool) []const []const u8 {
1925 const padded = std.fmt.allocPrint(a, state_pad, .{if (running) "running" else "queued"}) catch "";
2026 const word = if (running) styles.teal(a, padded) else styles.dim(a, padded);
2127 const head = callHead(a, call.name);
2228 const text = render.expandTabs(a, render.sanitize(a, call.summary), 4);
29+ const indent = spaces(a, state_width + 1 + "-> ".len + call.name.len + 1);
2330 var out: std.ArrayList([]const u8) = .empty;
24- out.append(a, std.fmt.allocPrint(a, "{s} {s} {s}", .{ word, head, text }) catch text) catch {};
25- return out.items;
26-}
27-
28-fn collapseWs(a: std.mem.Allocator, s: []const u8) []const u8 {
29- var out: std.ArrayList(u8) = .empty;
31+ var it = std.mem.splitScalar(u8, text, '\n');
3032 var i: usize = 0;
31- while (i < s.len) {
32- if (s[i] == '\n' or s[i] == '\r') {
33- if (out.items.len > 0 and out.items[out.items.len - 1] != ' ') out.append(a, ' ') catch {};
34- i += 1;
35- while (i < s.len and (s[i] == ' ' or s[i] == '\t' or s[i] == '\n' or s[i] == '\r')) i += 1;
36- continue;
33+ while (it.next()) |line| : (i += 1) {
34+ if (i == 0) {
35+ out.append(a, std.fmt.allocPrint(a, "{s} {s} {s}", .{ word, head, line }) catch line) catch {};
36+ } else {
37+ out.append(a, std.fmt.allocPrint(a, "{s}{s}", .{ indent, line }) catch line) catch {};
3738 }
38- out.append(a, s[i]) catch {};
39- i += 1;
4039 }
4140 return out.items;
4241 }
@@ -45,7 +44,7 @@ pub fn callSummary(a: std.mem.Allocator, name: []const u8, args_json: []const u8
4544 const parsed = std.json.parseFromSliceLeaky(std.json.Value, a, args_json, .{}) catch return args_json;
4645 if (parsed == .object) {
4746 if (std.mem.eql(u8, name, "bash")) {
48- if (parsed.object.get("command")) |c| if (c == .string) return collapseWs(a, c.string);
47+ if (parsed.object.get("command")) |c| if (c == .string) return c.string;
4948 }
5049 if (std.mem.eql(u8, name, "edit") or std.mem.eql(u8, name, "read")) {
5150 if (parsed.object.get("path")) |p| if (p == .string) return p.string;
@@ -54,12 +53,24 @@ pub fn callSummary(a: std.mem.Allocator, name: []const u8, args_json: []const u8
5453 return args_json;
5554 }
5655
57-pub fn callBody(a: std.mem.Allocator, name: []const u8, summary: []const u8) BodyLine {
56+pub fn callBody(a: std.mem.Allocator, name: []const u8, summary: []const u8) []const BodyLine {
57+ const head = callHead(a, name);
5858 const body = if (std.mem.eql(u8, name, "bash"))
5959 highlight.highlightOn(a, "bash", summary, .{})
6060 else
6161 summary;
62- return .{ .text = std.fmt.allocPrint(a, "{s} {s}", .{ callHead(a, name), body }) catch summary };
62+ const indent = spaces(a, "-> ".len + name.len + 2);
63+ var out: std.ArrayList(BodyLine) = .empty;
64+ var it = std.mem.splitScalar(u8, body, '\n');
65+ var i: usize = 0;
66+ while (it.next()) |line| : (i += 1) {
67+ const text = if (i == 0)
68+ std.fmt.allocPrint(a, "{s} {s}", .{ head, line }) catch line
69+ else
70+ std.fmt.allocPrint(a, "{s}{s}", .{ indent, line }) catch line;
71+ out.append(a, .{ .text = text }) catch {};
72+ }
73+ return out.items;
6374 }
6475
6576 pub fn resultLines(a: std.mem.Allocator, name: []const u8, text: []const u8, is_error: bool) []const BodyLine {