Use zig-lsp-codegen

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "src/tracy"]
 	path = src/tracy
 	url = https://github.com/wolfpld/tracy
+[submodule "src/tres"]
+	path = src/tres
+	url = https://github.com/ziglibs/tres.git

build.zig

@@ -92,6 +92,8 @@ pub fn build(b: *std.build.Builder) !void {
     const known_folders_path = b.option([]const u8, "known-folders", "Path to known-folders package (default: " ++ KNOWN_FOLDERS_DEFAULT_PATH ++ ")") orelse KNOWN_FOLDERS_DEFAULT_PATH;
     exe.addPackage(.{ .name = "known-folders", .source = .{ .path = known_folders_path } });
 
+    exe.addPackage(.{ .name = "tres", .source = .{ .path = "src/tres/tres.zig" } });
+
     if (enable_tracy) {
         const client_cpp = "src/tracy/TracyClient.cpp";
 
@@ -146,6 +148,7 @@ pub fn build(b: *std.build.Builder) !void {
     }
 
     tests.addPackage(.{ .name = "zls", .source = .{ .path = "src/zls.zig" }, .dependencies = exe.packages.items });
+    tests.addPackage(.{ .name = "tres", .source = .{ .path = "src/tres/tres.zig" } });
     tests.setBuildMode(.Debug);
     tests.setTarget(target);
     test_step.dependOn(&tests.step);

src/DocumentStore.zig

@@ -1,7 +1,6 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const types = @import("types.zig");
-const requests = @import("requests.zig");
+const types = @import("lsp.zig");
 const URI = @import("uri.zig");
 const analysis = @import("analysis.zig");
 const offsets = @import("offsets.zig");

src/header.zig → src/Header.zig

@@ -1,26 +1,27 @@
 const std = @import("std");
 
-const RequestHeader = struct {
-    content_length: usize,
+const Header = @This();
 
-    /// null implies "application/vscode-jsonrpc; charset=utf-8"
-    content_type: ?[]const u8,
+content_length: usize,
 
-    pub fn deinit(self: @This(), allocator: std.mem.Allocator) void {
-        if (self.content_type) |ct| allocator.free(ct);
-    }
-};
+/// null implies "application/vscode-jsonrpc; charset=utf-8"
+content_type: ?[]const u8 = null,
+
+pub fn deinit(self: @This(), allocator: std.mem.Allocator) void {
+    if (self.content_type) |ct| allocator.free(ct);
+}
 
-pub fn readRequestHeader(allocator: std.mem.Allocator, instream: anytype) !RequestHeader {
-    var r = RequestHeader{
+// Caller owns returned memory.
+pub fn parse(allocator: std.mem.Allocator, reader: anytype) !Header {
+    var r = Header{
         .content_length = undefined,
         .content_type = null,
     };
     errdefer r.deinit(allocator);
 
     var has_content_length = false;
     while (true) {
-        const header = try instream.readUntilDelimiterAlloc(allocator, '\n', 0x100);
+        const header = try reader.readUntilDelimiterAlloc(allocator, '\n', 0x100);
         defer allocator.free(header);
         if (header.len == 0 or header[header.len - 1] != '\r') return error.MissingCarriageReturn;
         if (header.len == 1) break;
@@ -41,3 +42,18 @@ pub fn readRequestHeader(allocator: std.mem.Allocator, instream: anytype) !Reque
 
     return r;
 }
+
+pub fn format(
+    header: Header,
+    comptime unused_fmt_string: []const u8,
+    options: std.fmt.FormatOptions,
+    writer: anytype,
+) @TypeOf(writer).Error!void {
+    _ = options;
+    std.debug.assert(unused_fmt_string.len == 0);
+    try writer.print("Content-Length: {}\r\n", .{header.content_length});
+    if (header.content_type) |content_type| {
+        try writer.print("Content-Type: {s}\r\n", .{content_type});
+    }
+    try writer.writeAll("\r\n");
+}