Splice zig's parser into zls

zigtools · Oct 17, 2023 · 43ab6ca · 43ab6ca
1 parent e4593da
commit 43ab6ca
Show file tree

Hide file tree

Showing 6 changed files with 19,117 additions and 2 deletions.
diff --git a/src/DocumentStore.zig b/src/DocumentStore.zig
@@ -13,6 +13,7 @@ const Config = @import("Config.zig");
 const ZigVersionWrapper = @import("ZigVersionWrapper.zig");
 const translate_c = @import("translate_c.zig");
 const ComptimeInterpreter = @import("ComptimeInterpreter.zig");
+const Parser = @import("stage2/Ast.zig");
 const AstGen = @import("stage2/AstGen.zig");
 const Zir = @import("stage2/Zir.zig");
 const InternPool = @import("analyser/InternPool.zig");
@@ -754,8 +755,16 @@ fn createDocument(self: *DocumentStore, uri: Uri, text: [:0]const u8, open: bool
         var duped_uri = try self.allocator.dupe(u8, uri);
         errdefer self.allocator.free(duped_uri);
 
-        var tree = try Ast.parse(self.allocator, text, .zig);
-        errdefer tree.deinit(self.allocator);
+        // var tree = try Ast.parse(self.allocator, text, .zig);
+        var zls_ast = try Parser.parse(self.allocator, text, .zig);
+        errdefer zls_ast.deinit(self.allocator);
+        var tree = Ast{
+            .source = zls_ast.source,
+            .tokens = zls_ast.tokens,
+            .nodes = zls_ast.nodes,
+            .extra_data = zls_ast.extra_data,
+            .errors = zls_ast.errors,
+        };
 
         // remove unused capacity
         var nodes = tree.nodes.toMultiArrayList();