diff --git a/src/Project.zig b/src/Project.zig index 0948544..22398b6 100644 --- a/src/Project.zig +++ b/src/Project.zig @@ -348,27 +348,16 @@ fn make_URI(self: *Self, file_path: ?[]const u8) LspError![]const u8 { var buf: std.Io.Writer.Allocating = .init(self.allocator); defer buf.deinit(); const writer = &buf.writer; - try writer.writeAll("file://"); if (file_path) |path| { if (std.fs.path.isAbsolute(path)) { - try write_URI_path(writer, path); + try writer.print("file://{s}", .{path}); } else { - try write_URI_path(writer, self.name); - try writer.writeByte('/'); - try write_URI_path(writer, path); + try writer.print("file://{s}{c}{s}", .{ self.name, std.fs.path.sep, path }); } - } else try write_URI_path(writer, self.name); + } else try writer.print("file://{s}", .{self.name}); return buf.toOwnedSlice(); } -fn write_URI_path(writer: *std.Io.Writer, path: []const u8) std.Io.Writer.Error!void { - for (path) |c| try switch (c) { - std.fs.path.sep => writer.writeByte('/'), - // ':' => writer.writeAll("%3A"), - else => writer.writeByte(c), - }; -} - fn sort_files_by_mtime(self: *Self) void { sort_by_mtime(File, self.files.items); } @@ -990,31 +979,25 @@ fn send_goto_request(self: *Self, from: tp.pid_ref, file_path: []const u8, row: } fn file_uri_to_path(uri: []const u8, file_path_buf: []u8) error{InvalidTargetURI}![]u8 { - const file_path = std.Uri.percentDecodeBackwards(file_path_buf, if (std.mem.eql(u8, uri[0..7], "file://")) + return std.Uri.percentDecodeBackwards(file_path_buf, if (std.mem.eql(u8, uri[0..7], "file://")) uri[7..] else if (std.mem.eql(u8, uri[0..5], "file:")) uri[5..] else return error.InvalidTargetURI); - return convert_path(file_path); -} - -fn convert_path(file_path_: []u8) []u8 { - var file_path = file_path_; - if (builtin.os.tag == .windows) { - if (file_path[0] == '/') file_path = file_path[1..]; - for (file_path, 0..) |c, i| if (c == '/') { - file_path[i] = '\\'; - }; - } - return file_path; } fn navigate_to_location_link(from: tp.pid_ref, location_link: []const u8) (error{InvalidTargetURI} || LocationLinkError)!void { const location: LocationLink = try read_locationlink(location_link); if (location.targetUri == null or location.targetRange == null) return error.InvalidLocationLink; var file_path_buf: [std.fs.max_path_bytes]u8 = undefined; - const file_path = try file_uri_to_path(location.targetUri.?, &file_path_buf); + var file_path = try file_uri_to_path(location.targetUri.?, &file_path_buf); + if (builtin.os.tag == .windows) { + if (file_path[0] == '/') file_path = file_path[1..]; + for (file_path, 0..) |c, i| if (c == '/') { + file_path[i] = '\\'; + }; + } if (location.targetSelectionRange) |sel| { from.send(.{ "cmd", "navigate", .{ .file = file_path, @@ -1140,7 +1123,13 @@ fn send_reference(tag: []const u8, to: tp.pid_ref, location_: []const u8, name: const location: LocationLink = try read_locationlink(location_); if (location.targetUri == null or location.targetRange == null) return error.InvalidLocationLink; var file_path_buf: [std.fs.max_path_bytes]u8 = undefined; - const file_path = try file_uri_to_path(location.targetUri.?, &file_path_buf); + var file_path = try file_uri_to_path(location.targetUri.?, &file_path_buf); + if (builtin.os.tag == .windows) { + if (file_path[0] == '/') file_path = file_path[1..]; + for (file_path, 0..) |c, i| if (c == '/') { + file_path[i] = '\\'; + }; + } const line = try get_line_of_file(allocator, file_path, location.targetRange.?.start.line); defer allocator.free(line); const file_path_ = if (file_path.len > name.len and std.mem.eql(u8, name, file_path[0..name.len])) @@ -1407,7 +1396,13 @@ fn send_symbol_information(to: tp.pid_ref, file_path: []const u8, item: []const if (location) |location_| { if (location_.targetUri == null or location_.targetRange == null) return error.InvalidSymbolInformationField; var file_path_buf: [std.fs.max_path_bytes]u8 = undefined; - const file_path_ = try file_uri_to_path(location_.targetUri.?, &file_path_buf); + var file_path_ = try file_uri_to_path(location_.targetUri.?, &file_path_buf); + if (builtin.os.tag == .windows) { + if (file_path_[0] == '/') file_path_ = file_path_[1..]; + for (file_path_, 0..) |c, i| if (c == '/') { + file_path_[i] = '\\'; + }; + } fp = file_path_; to.send(.{ "cmd", "add_symbol_information", .{ fp, name, parent_name, kind, location_.targetRange.?.start.line, location_.targetRange.?.start.character, location_.targetRange.?.end.line, location_.targetRange.?.end.character, tags[0..len_tags_], location_.targetSelectionRange.?.start.line, location_.targetSelectionRange.?.start.character, location_.targetSelectionRange.?.end.line, location_.targetSelectionRange.?.end.character, deprecated, location_.targetUri } }) catch |e| { std.log.err("send add_symbol_information failed: {t}", .{e}); @@ -1616,7 +1611,13 @@ pub fn rename_symbol(self: *Self, from: tp.pid_ref, file_path: []const u8, row: try cbor.writeArrayHeader(w, renames.items.len); for (renames.items) |rename| { var file_path_buf: [std.fs.max_path_bytes]u8 = undefined; - const file_path_ = try file_uri_to_path(rename.uri, &file_path_buf); + var file_path_ = try file_uri_to_path(rename.uri, &file_path_buf); + if (builtin.os.tag == .windows) { + if (file_path_[0] == '/') file_path_ = file_path_[1..]; + for (file_path_, 0..) |c, i| if (c == '/') { + file_path_[i] = '\\'; + }; + } const line = try get_line_of_file(allocator, self_.file_path, rename.range.start.line); try cbor.writeValue(w, .{ file_path_, @@ -2633,7 +2634,7 @@ pub fn process_git(self: *Self, parent: tp.pid_ref, m: tp.message) (OutOfMemoryE try self.loaded(parent); } else if (try m.match(.{ tp.any, tp.any, "workspace_path", tp.extract(&value) })) { if (self.workspace) |p| self.allocator.free(p); - self.workspace = convert_path(try self.allocator.dupe(u8, value)); + self.workspace = try self.allocator.dupe(u8, value); self.state.workspace_path = .done; self.state.workspace_files = .running; git.workspace_files(@intFromPtr(self)) catch { @@ -2664,7 +2665,7 @@ pub fn process_git(self: *Self, parent: tp.pid_ref, m: tp.message) (OutOfMemoryE }; const file_type: []const u8, const file_icon: []const u8, const file_color: u24 = guess_file_type(path); (try self.pending.addOne(self.allocator)).* = .{ - .path = convert_path(try self.allocator.dupe(u8, path)), + .path = try self.allocator.dupe(u8, path), .type = file_type, .icon = file_icon, .color = file_color, @@ -2680,7 +2681,7 @@ pub fn process_git(self: *Self, parent: tp.pid_ref, m: tp.message) (OutOfMemoryE self.longest_new_or_modified_file_path = @max(self.longest_new_or_modified_file_path, path.len); const file_type: []const u8, const file_icon: []const u8, const file_color: u24 = guess_file_type(path); (try self.new_or_modified_files.addOne(self.allocator)).* = .{ - .path = convert_path(try self.allocator.dupe(u8, path)), + .path = try self.allocator.dupe(u8, path), .type = file_type, .icon = file_icon, .color = file_color, diff --git a/src/walk_tree.zig b/src/walk_tree.zig index c88bbeb..6c0e3e7 100644 --- a/src/walk_tree.zig +++ b/src/walk_tree.zig @@ -90,7 +90,6 @@ pub fn start(a_: std.mem.Allocator, root_path_: []const u8, entry_handler: Entry } const filtered_dirs = [_][]const u8{ - "AppData", ".cache", ".cargo", ".git",