diff options
Diffstat (limited to 'src/ninep/events.zig')
| -rw-r--r-- | src/ninep/events.zig | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/ninep/events.zig b/src/ninep/events.zig index 77a4e35f..9e6df93d 100644 --- a/src/ninep/events.zig +++ b/src/ninep/events.zig @@ -233,6 +233,10 @@ pub fn noteError(p: *Pardes, req: Req, reply: Reply) void { if ((f == .exec or f == .look) and p.fs.ran_at != 0) serial = name.print("{d}", .{p.fs.ran_at}); }, + .port => |i| { + serial = "-"; + file = name.print("plumb/{s}", .{pardes.Plumb.portName(p, i) orelse "?"}); + }, .col => |c| { serial = "-"; file = if (c.file == .dir) @@ -677,22 +681,21 @@ fn scanNumber(data: []const u8, i: *usize, overflow: *bool) ?u32 { /// What a click at `at` takes, as the mouse's does (exec.operandAt), /// for an empty range written back: the file name or word under it on its -/// line (look.expandedWord), else nothing; in a diff pane's body, for a -/// look alone (`for_look`, exec.operandAt), look.diffClick's answer, the -/// line's address or its code's words. +/// line (look.expandedWord), else nothing; in a body whose rows name +/// addresses, for a look alone (`for_look`, exec.operandAt), +/// look.rowAddressAt's answer, the row's address or its code's words. pub fn expandAt(p: *Pardes, pane: *Pane, whole: []const u8, at: usize, in_body: bool, for_look: bool) []const u8 { const start = if (std.mem.lastIndexOfScalar(u8, whole[0..at], '\n')) |nl| nl + 1 else 0; const end = std.mem.indexOfScalarPos(u8, whole, at, '\n') orelse whole.len; var word_from: usize = 0; - if (in_body and for_look) diff: { + if (in_body and for_look) row_address: { const row = std.mem.count(u8, whole[0..start], "\n"); - // Only when the served line is the one the diff reads there. - const lines = look.diffLines(p, pane) orelse break :diff; - if (row >= lines.len or !std.mem.eql(u8, std.mem.trimEnd(u8, lines[row], "\r"), std.mem.trimEnd(u8, whole[start..end], "\r"))) break :diff; var buf: [4096 + 32]u8 = undefined; - const click = look.diffClick(p, pane, row, at - start, &buf) orelse break :diff; - if (click.address) |address| return p.scratch.allocator().dupe(u8, address) catch ""; - word_from = click.word_from; + const got = look.rowAddressAt(p, pane, row, at - start, &buf) orelse break :row_address; + // Only when the served line is the one the address was read from. + if (!std.mem.eql(u8, std.mem.trimEnd(u8, got.line, "\r"), std.mem.trimEnd(u8, whole[start..end], "\r"))) break :row_address; + if (got.address) |address| return p.scratch.allocator().dupe(u8, address) catch ""; + word_from = got.word_from; } const line = whole[start..end]; if (at - start < word_from or word_from > line.len) return ""; @@ -1303,6 +1306,7 @@ test "after a Restore a new pane or column takes a serial past every one the old } test "a pane named before it is announced has its new under that name, and no rename before it" { + if (pardes.Term.ops == null) return error.SkipZigTest; // a shell const p = try withFile(testing.allocator, "one\n"); defer p.deinit(); const pane = p.panes[0].?; |
