From 85b60dedb6bdb192abd11b2d58ca7c0e8c944b18 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Thu, 1 Oct 2026 06:22:44 -0300 Subject: A Rename, references and the like tell the server of every open file of its language first, so a rename reaches files it had not seen and the preview lists them zls renames only in the documents in its store, and syncDoc told it of a file only when a query was asked from it, so renaming in progress.zig left main.zig unchanged and broken, with no preview. For a query whose answer can reach other files (rename, references, implementation, workspace symbols, calls and type hierarchy), the host snapshots every other open file and the client syncs those its server answers for first. The mock server answers a rename in each document it was told of; lsp-rename-files opens main.rs by a look, renames from lib.rs, and its preview lists both. Co-Authored-By: Claude Opus 5.5 --- test/lspmock.zig | 31 ++++++++++++++++++++++++++++--- test/snapshots/lsp-rename-files.golden | 27 +++++++++++++++++++++++++++ test/snapshots/lsp-rename-files.snap | 29 +++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 test/snapshots/lsp-rename-files.golden create mode 100644 test/snapshots/lsp-rename-files.snap (limited to 'test') diff --git a/test/lspmock.zig b/test/lspmock.zig index 7b379b49..001c3488 100644 --- a/test/lspmock.zig +++ b/test/lspmock.zig @@ -97,6 +97,20 @@ fn range(a: std.mem.Allocator, line: u32, from: u32, to: u32) []const u8 { var root_uri: [512]u8 = undefined; var root_uri_len: usize = 0; +/// The documents the editor has opened here (didOpen), as zls keeps its +/// store: a rename answers in each of them, and in no file it never saw. +var opened: [8][512]u8 = undefined; +var opened_len: [8]usize = @splat(0); +var opened_n: usize = 0; + +fn noteOpened(uri: []const u8) void { + for (opened[0..opened_n], opened_len[0..opened_n]) |*o, n| if (std.mem.eql(u8, o[0..n], uri)) return; + if (opened_n == opened.len or uri.len > opened[0].len) return; + @memcpy(opened[opened_n][0..uri.len], uri); + opened_len[opened_n] = uri.len; + opened_n += 1; +} + pub fn main(init: std.process.Init) !void { _ = init; if (getenv("LSPMOCK_MODE")) |m| { @@ -187,6 +201,7 @@ fn handle(a: std.mem.Allocator, raw: []const u8) void { notify(a, "$/progress", "{{\"token\":\"t1\",\"value\":{{\"kind\":\"end\"}}}}", .{}); return; } + if (std.mem.eql(u8, method, "textDocument/didOpen")) noteOpened(reqUri(params)); if (id == null) return; // didOpen/didChange/$/cancelRequest: nothing to say if (mode == .mute) return; // swallow every request after the handshake @@ -227,10 +242,20 @@ fn handle(a: std.mem.Allocator, raw: []const u8) void { q, root_uri[0..root_uri_len], range(a, 1, 7, 10), }); } else if (std.mem.eql(u8, method, "textDocument/rename")) { + // In every document it has seen: lib.rs's definition, main.rs's two + // calls (any other file reads as main.rs's shape). const nn = str(get(params, "newName")) orelse "renamed"; - reply(a, rid, "{{\"changes\":{{\"{s}\":[{{\"range\":{s},\"newText\":\"{s}\"}},{{\"range\":{s},\"newText\":\"{s}\"}}]}}}}", .{ - uri, range(a, 3, 12, 15), nn, range(a, 4, 12, 15), nn, - }); + var changes: std.ArrayList(u8) = .empty; + for (opened[0..opened_n], opened_len[0..opened_n], 0..) |*o, n, k| { + const doc = o[0..n]; + const edits = if (std.mem.endsWith(u8, doc, "/lib.rs")) + std.fmt.allocPrint(a, "[{{\"range\":{s},\"newText\":\"{s}\"}}]", .{ range(a, 1, 7, 10), nn }) catch return + else + std.fmt.allocPrint(a, "[{{\"range\":{s},\"newText\":\"{s}\"}},{{\"range\":{s},\"newText\":\"{s}\"}}]", .{ range(a, 3, 12, 15), nn, range(a, 4, 12, 15), nn }) catch return; + changes.print(a, "{s}\"{s}\":{s}", .{ if (k > 0) "," else "", doc, edits }) catch return; + } + if (opened_n == 0) changes.print(a, "\"{s}\":[{{\"range\":{s},\"newText\":\"{s}\"}},{{\"range\":{s},\"newText\":\"{s}\"}}]", .{ uri, range(a, 3, 12, 15), nn, range(a, 4, 12, 15), nn }) catch return; + reply(a, rid, "{{\"changes\":{{{s}}}}}", .{changes.items}); } else if (std.mem.eql(u8, method, "textDocument/formatting")) { reply(a, rid, "[{{\"range\":{s},\"newText\":\"// formatted by mock\\n\"}}]", .{range(a, 0, 0, 0)}); } else if (std.mem.eql(u8, method, "textDocument/codeAction")) { diff --git a/test/snapshots/lsp-rename-files.golden b/test/snapshots/lsp-rename-files.golden new file mode 100644 index 00000000..230246f6 --- /dev/null +++ b/test/snapshots/lsp-rename-files.golden @@ -0,0 +1,27 @@ +== snap opened grid=100x25 cursor=7,8 +|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| New Tty Find Grep Joincol Delcol +| /tmp/pardes-snap/lsp-rename-files/cwd/lib.rs Save Tty Collapse Del TreeContext +| 1 // main.rs +| 2 pub fn add(a: i32, b: i32) -> i32 { +| 3 a + b +| 4 } +| /tmp/pardes-snap/lsp-rename-files/cwd/main.rs Save Tty Collapse Del TreeContext +| 1 mod lib; +| 2 +| 3 fn main() { +| 4 let x = add(1, 2); +| 5 let y = add(3, 4); +| 6 let _ = x + y; +| 7 } +| 8 +== snap previewed grid=100x25 cursor=14,4 +|3: 1 // main.rs Rename: 3 edit(s) across files, previewed, not applied +|15: /tmp/pardes-snap/lsp-rename-files/cwd/+Search Save Tty Collapse Del LocationsConfig +|16: 1 lib.rs:2:8 +|17: 2 sum +|18: 3 main.rs:4:13-15 +|19: 4 sum +|20: 5 main.rs:5:13-15 +|21: 6 sum +|22: 7 diff --git a/test/snapshots/lsp-rename-files.snap b/test/snapshots/lsp-rename-files.snap new file mode 100644 index 00000000..0114c795 --- /dev/null +++ b/test/snapshots/lsp-rename-files.snap @@ -0,0 +1,29 @@ +# A Rename reaches the other files open in the editor. A server renames in +# the documents it has seen (zls's store), so before a query whose answer can +# reach other files the client tells it of every open file of its language. +# Here main.rs is opened by a look, asking the server nothing, and the rename +# is asked from lib.rs: the mock answers in each document it was told of, so +# the preview lists main.rs's two calls and lib.rs's definition. +file lib.rs // main.rs\npub fn add(a: i32, b: i32) -> i32 {\n a + b\n}\n +file main.rs mod lib;\n\nfn main() {\n let x = add(1, 2);\n let y = add(3, 4);\n let _ = x + y;\n}\n +start 25 100 lib.rs +wait 8000 pub fn add +stable 700 20000 +press right @main.rs 4 +release right @main.rs 4 +wait 8000 let x = add +stable 700 15000 +snap opened +# into lib.rs's `add`, and rename it from there +press left @add 5 +release left @add 5 +stable 400 5000 +key space +key l +key r +stable 400 5000 +text sum +key enter +wait 10000 sum +stable 700 15000 +snap previewed -- cgit v1.3