Merge pull request #28 from zigtools/dev

Author: Techatrix

README.md

@@ -1,6 +1,6 @@
 [![CI](https://github.com/zigtools/lsp-kit/actions/workflows/main.yml/badge.svg)](https://github.com/zigtools/lsp-kit/actions)
 [![codecov](https://codecov.io/gh/zigtools/lsp-kit/graph/badge.svg?token=C3HCN59E4C)](https://codecov.io/gh/zigtools/lsp-kit)
-[![Documentation](https://badgen.net/badge/icon/Docs?icon=wiki&label)](https://zigtools.github.io/lsp-kit)
+[![Documentation](https://img.shields.io/badge/Docs-grey?logo=zig)](https://zigtools.github.io/lsp-kit)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 # Zig LSP Kit

build.zig

@@ -27,7 +27,7 @@ pub fn build(b: *std.Build) void {
     const exe = b.addExecutable(.{
         .name = "lsp-codegen",
         .root_module = b.addModule("lsp-codegen", .{
-            .root_source_file = b.path("src/main.zig"),
+            .root_source_file = b.path("src/codegen/codegen.zig"),
             .target = b.graph.host,
         }),
     });
@@ -62,6 +62,9 @@ pub fn build(b: *std.Build) void {
         },
     });
 
+    const codegen_step = b.step("codegen", "Install LSP types generated from the meta model");
+    codegen_step.dependOn(&b.addInstallFile(lsp_types_output_file, "lsp_types.zig").step);
+
     // -------------------------------- Autodoc --------------------------------
 
     const autodoc_exe = b.addObject(.{

examples/hello_client.zig

@@ -125,7 +125,7 @@ pub fn main() !void {
         const documentFormattingProvider = initialize_result.capabilities.documentFormattingProvider orelse break :blk false;
         switch (documentFormattingProvider) {
             .bool => |supported| break :blk supported,
-            .DocumentFormattingOptions => break :blk true,
+            .document_formatting_options => break :blk true,
         }
     };
 
@@ -150,11 +150,11 @@ pub fn main() !void {
     try transport.writeNotification(
         gpa,
         "textDocument/didOpen", // https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_didOpen
-        lsp.types.DidOpenTextDocumentParams,
+        lsp.types.TextDocument.DidOpenParams,
         .{
             .textDocument = .{
                 .uri = "untitled:Document", // Usually a file system uri will be provided like 'file:///path/to/main.zig'
-                .languageId = "",
+                .languageId = .{ .custom_value = "" },
                 .text = input_file,
                 .version = 0,
             },
@@ -168,7 +168,7 @@ pub fn main() !void {
         gpa,
         .{ .number = 1 },
         "textDocument/formatting", // https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_formatting
-        lsp.types.DocumentFormattingParams,
+        lsp.types.document_formatting.Params,
         .{
             .textDocument = .{ .uri = "untitled:Document" },
             .options = .{ .tabSize = 4, .insertSpaces = true },

examples/hello_server.zig

@@ -191,7 +191,7 @@ const RequestMethods = union(enum) {
     /// https://microsoft.github.io/language-server-protocol/specifications/specification-current/#shutdown
     shutdown,
     /// https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_formatting
-    @"textDocument/formatting": lsp.types.DocumentFormattingParams,
+    @"textDocument/formatting": lsp.types.document_formatting.Params,
     other: lsp.MethodWithParams,
 };
 
@@ -201,10 +201,10 @@ const NotificationMethods = union(enum) {
     /// https://microsoft.github.io/language-server-protocol/specifications/specification-current/#exit
     exit,
     /// https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_didOpen
-    @"textDocument/didOpen": lsp.types.DidOpenTextDocumentParams,
+    @"textDocument/didOpen": lsp.types.TextDocument.DidOpenParams,
     /// https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_didChange
-    @"textDocument/didChange": lsp.types.DidChangeTextDocumentParams,
+    @"textDocument/didChange": lsp.types.TextDocument.DidChangeParams,
     /// https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_didClose
-    @"textDocument/didClose": lsp.types.DidCloseTextDocumentParams,
+    @"textDocument/didClose": lsp.types.TextDocument.DidCloseParams,
     other: lsp.MethodWithParams,
 };

examples/my_first_server.zig

@@ -107,7 +107,7 @@ pub const Handler = struct {
                 .@"utf-32" => .@"utf-32",
             },
             .textDocumentSync = .{
-                .TextDocumentSyncOptions = .{
+                .text_document_sync_options = .{
                     .openClose = true,
                     .change = .Full,
                 },
@@ -163,7 +163,7 @@ pub const Handler = struct {
     pub fn @"textDocument/didOpen"(
         self: *Handler,
         _: std.mem.Allocator,
-        notification: lsp.types.DidOpenTextDocumentParams,
+        notification: lsp.types.TextDocument.DidOpenParams,
     ) !void {
         std.log.debug("Received 'textDocument/didOpen' notification", .{});
 
@@ -187,7 +187,7 @@ pub const Handler = struct {
     pub fn @"textDocument/didChange"(
         self: *Handler,
         _: std.mem.Allocator,
-        notification: lsp.types.DidChangeTextDocumentParams,
+        notification: lsp.types.TextDocument.DidChangeParams,
     ) !void {
         std.log.debug("Received 'textDocument/didChange' notification", .{});
 
@@ -203,11 +203,11 @@ pub const Handler = struct {
 
         for (notification.contentChanges) |content_change| {
             switch (content_change) {
-                .literal_1 => |change| {
+                .text_document_content_change_whole_document => |change| {
                     buffer.clearRetainingCapacity();
                     try buffer.appendSlice(self.allocator, change.text);
                 },
-                .literal_0 => |change| {
+                .text_document_content_change_partial => |change| {
                     const loc = lsp.offsets.rangeToLoc(buffer.items, change.range, self.offset_encoding);
                     try buffer.replaceRange(self.allocator, loc.start, loc.end - loc.start, change.text);
                 },
@@ -223,7 +223,7 @@ pub const Handler = struct {
     pub fn @"textDocument/didClose"(
         self: *Handler,
         _: std.mem.Allocator,
-        notification: lsp.types.DidCloseTextDocumentParams,
+        notification: lsp.types.TextDocument.DidCloseParams,
     ) !void {
         std.log.debug("Received 'textDocument/didClose' notification", .{});
 
@@ -241,7 +241,7 @@ pub const Handler = struct {
     pub fn @"textDocument/hover"(
         handler: *Handler,
         _: std.mem.Allocator,
-        params: lsp.types.HoverParams,
+        params: lsp.types.Hover.Params,
     ) ?lsp.types.Hover {
         std.log.debug("Received 'textDocument/hover' request", .{});
 
@@ -253,7 +253,7 @@ pub const Handler = struct {
 
         return .{
             .contents = .{
-                .MarkupContent = .{
+                .markup_content = .{
                     .kind = .plaintext,
                     .value = "I don't know what you are hovering over but I'd like to point out that you have a nice editor theme",
                 },
@@ -264,8 +264,8 @@ pub const Handler = struct {
     pub fn @"textDocument/completion"(
         _: *Handler,
         arena: std.mem.Allocator,
-        params: lsp.types.CompletionParams,
-    ) error{OutOfMemory}!lsp.ResultType("textDocument/completion") {
+        params: lsp.types.completion.Params,
+    ) error{OutOfMemory}!?lsp.types.completion.Result {
         std.log.debug("Received 'textDocument/completion' notification", .{});
 
         if (params.context) |context| {
@@ -275,7 +275,7 @@ pub const Handler = struct {
             });
         }
 
-        const completions = try arena.dupe(lsp.types.CompletionItem, &.{
+        const completions = try arena.dupe(lsp.types.completion.Item, &.{
             .{
                 .label = "get",
                 .detail = "get the value",
@@ -285,7 +285,7 @@ pub const Handler = struct {
                 .detail = "set the value",
             },
         });
-        return .{ .array_of_CompletionItem = completions };
+        return .{ .completion_items = completions };
     }
 
     /// We received a response message from the client/editor.