neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(lsp): rename_symbol: decode and normalize file uri

Browse source
This commit is contained in:
CJ van den Berg 2025-01-16 21:45:46 +01:00
parent bfdeffc70f
commit e597fee2e5
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Project.zig
View file

@ -815,8 +815,10 @@ pub fn rename_symbol(self: *Self, from: tp.pid_ref, file_path: []const u8, row:
try cbor.writeValue(w, "rename_symbol_item"); try cbor.writeValue(w, "rename_symbol_item");
try cbor.writeArrayHeader(w, renames.items.len); try cbor.writeArrayHeader(w, renames.items.len);
for (renames.items) |rename| { for (renames.items) |rename| {
var file_path_buf: [std.fs.max_path_bytes]u8 = undefined;
const file_path_ = std.Uri.percentDecodeBackwards(&file_path_buf, rename.uri[7..]);
try cbor.writeValue(w, .{ try cbor.writeValue(w, .{
rename.uri, file_path_,
rename.range.start.line, rename.range.start.line,
rename.range.start.character, rename.range.start.character,
rename.range.end.line, rename.range.end.line,

24
src/tui/mainview.zig
View file

@ -564,8 +564,8 @@ const cmds = struct {
while (len != 0) { while (len != 0) {
len -= 1; len -= 1;
std.debug.assert(try cbor.decodeArrayHeader(&iter) == 6); std.debug.assert(try cbor.decodeArrayHeader(&iter) == 6);
var file_uri: []const u8 = undefined; var file_path: []const u8 = undefined;
if (!try cbor.matchString(&iter, &file_uri)) return error.MissingArgument; if (!try cbor.matchString(&iter, &file_path)) return error.MissingArgument;
var sel: ed.Selection = .{}; var sel: ed.Selection = .{};
if (!try cbor.matchInt(usize, &iter, &sel.begin.row)) return error.MissingArgument; if (!try cbor.matchInt(usize, &iter, &sel.begin.row)) return error.MissingArgument;
if (!try cbor.matchInt(usize, &iter, &sel.begin.col)) return error.MissingArgument; if (!try cbor.matchInt(usize, &iter, &sel.begin.col)) return error.MissingArgument;
@ -574,18 +574,14 @@ const cmds = struct {
var new_text: []const u8 = undefined; var new_text: []const u8 = undefined;
if (!try cbor.matchString(&iter, &new_text)) return error.MissingArgument; if (!try cbor.matchString(&iter, &new_text)) return error.MissingArgument;
if (self.get_active_editor()) |editor| { file_path = project_manager.normalize_file_path(file_path);
// TODO match file_uri correctly. endsWith() isn't correct because 'path' is a if (self.get_active_editor()) |editor| if (std.mem.eql(u8, file_path, editor.file_path orelse "")) {
// short, relative path while 'file_uri' is an absolute path starting with 'file://' try editor.rename_symbol_item(sel, new_text, &mroot, len == 0);
const match = if (editor.file_path) |path| std.mem.endsWith(u8, file_uri, path) else false; } else {
if (match) { const logger = log.logger("LSP");
try editor.rename_symbol_item(sel, new_text, &mroot, len == 0); defer logger.deinit();
} else { logger.print("TODO perform renames in other files\n", .{});
const logger = log.logger("LSP"); };
defer logger.deinit();
logger.print("TODO perform renames in other files\n", .{});
}
}
} }
} }
pub const rename_symbol_item_meta = .{ .arguments = &.{.array} }; pub const rename_symbol_item_meta = .{ .arguments = &.{.array} };