From 6e4d2a4357b20e3fa65c59993bb26007af04317f Mon Sep 17 00:00:00 2001
From: mochalins <117967760+mochalins@users.noreply.github.com>
Date: Wed, 26 Nov 2025 07:42:24 +0900
Subject: [PATCH] feat: Use new Zig type builtins replacing `@Type`

---
 build.zig.zon        |  2 +-
 src/basic_server.zig | 58 ++++++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/build.zig.zon b/build.zig.zon
index b76f4e7..80e57ee 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -1,7 +1,7 @@
 .{
     .name = .lsp_kit,
     .version = "0.1.0",
-    .minimum_zig_version = "0.16.0-dev.1204+389368392",
+    .minimum_zig_version = "0.16.0-dev.1455+6d543bcf9",
     .dependencies = .{},
     .paths = .{
         "build.zig",
diff --git a/src/basic_server.zig b/src/basic_server.zig
index fe4300e..f68463f 100644
--- a/src/basic_server.zig
+++ b/src/basic_server.zig
@@ -588,7 +588,7 @@ pub fn validateServerCapabilities(comptime Handler: type, capabilities: types.Se
                         \\    arena: std.mem.Allocator,
                         \\    params: {},
                         \\) {} {{}}
-                        \\ 
+                        \\
                     , .{
                         std.zig.fmtId(method_name),
                         Handler,
@@ -610,38 +610,44 @@ fn MessageType(comptime Handler: type) type {
         &.{ lsp.isRequestMethod, lsp.isNotificationMethod },
         &.{ &RequestParams, &NotificationParams },
     ) |isMethod, Params| {
-        var methods: []const [:0]const u8 = &.{};
+        var methods: []const []const u8 = &.{};
 
         for (std.meta.declarations(Handler)) |decl| {
             if (isMethod(decl.name)) {
-                methods = methods ++ [1][:0]const u8{decl.name};
+                methods = methods ++ [_][]const u8{decl.name};
             }
         }
+        methods = methods ++ [_][]const u8{"other"};
+
+        const MethodTag = std.math.IntFittingRange(0, methods.len);
+        var method_values: [methods.len]MethodTag = undefined;
+        for (0..methods.len) |i| {
+            method_values[i] = i;
+        }
 
-        var enum_fields: [methods.len + 1]std.builtin.Type.EnumField = undefined;
-        for (enum_fields[0 .. enum_fields.len - 1], methods, 0..) |*field, method, i| field.* = .{ .name = method, .value = i };
-        enum_fields[methods.len] = .{ .name = "other", .value = methods.len };
-
-        const MethodEnum = @Type(.{ .@"enum" = .{
-            .tag_type = std.math.IntFittingRange(0, methods.len),
-            .fields = &enum_fields,
-            .decls = &.{},
-            .is_exhaustive = true,
-        } });
-
-        var union_fields: [methods.len + 1]std.builtin.Type.UnionField = undefined;
-        for (union_fields[0 .. union_fields.len - 1], methods) |*field, method| {
-            const field_type = lsp.ParamsType(method);
-            field.* = .{ .name = method, .type = field_type, .alignment = @alignOf(field_type) };
+        const MethodEnum = @Enum(
+            MethodTag,
+            .exhaustive,
+            methods,
+            &method_values,
+        );
+
+        var union_types: [methods.len]type = undefined;
+        var union_attrs: [methods.len]std.builtin.Type.UnionField.Attributes = undefined;
+        for (0..methods.len - 1) |i| {
+            union_types[i] = lsp.ParamsType(methods[i]);
+            union_attrs[i] = .{ .@"align" = @alignOf(union_types[i]) };
         }
-        union_fields[methods.len] = .{ .name = "other", .type = lsp.MethodWithParams, .alignment = @alignOf(lsp.MethodWithParams) };
-
-        Params.* = @Type(.{ .@"union" = .{
-            .layout = .auto,
-            .tag_type = MethodEnum,
-            .fields = &union_fields,
-            .decls = &.{},
-        } });
+        union_types[methods.len - 1] = lsp.MethodWithParams;
+        union_attrs[methods.len - 1] = .{ .@"align" = @alignOf(lsp.MethodWithParams) };
+
+        Params.* = @Union(
+            .auto,
+            MethodEnum,
+            methods,
+            &union_types,
+            &union_attrs,
+        );
     }
 
     return lsp.Message(RequestParams, NotificationParams, .{});