Skip to content

Commit 21b8c0b

Browse files
committed
Splice zig's parser into zls
1 parent ef6c85f commit 21b8c0b

File tree

6 files changed

+19116
-2
lines changed

6 files changed

+19116
-2
lines changed

src/DocumentStore.zig

+10-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const Config = @import("Config.zig");
1313
const ZigVersionWrapper = @import("ZigVersionWrapper.zig");
1414
const translate_c = @import("translate_c.zig");
1515
const ComptimeInterpreter = @import("ComptimeInterpreter.zig");
16+
const Parser = @import("stage2/Ast.zig");
1617
const AstGen = @import("stage2/AstGen.zig");
1718
const Zir = @import("stage2/Zir.zig");
1819
const InternPool = @import("analyser/InternPool.zig");
@@ -279,8 +280,15 @@ pub const Handle = struct {
279280
const tracy_zone_inner = tracy.traceNamed(@src(), "Ast.parse");
280281
defer tracy_zone_inner.end();
281282

282-
var tree = try Ast.parse(allocator, new_text, .zig);
283-
errdefer tree.deinit(allocator);
283+
var zls_ast = try Parser.parse(allocator, new_text, .zig);
284+
errdefer zls_ast.deinit(allocator);
285+
var tree = Ast{
286+
.source = zls_ast.source,
287+
.tokens = zls_ast.tokens,
288+
.nodes = zls_ast.nodes,
289+
.extra_data = zls_ast.extra_data,
290+
.errors = zls_ast.errors,
291+
};
284292

285293
// remove unused capacity
286294
var nodes = tree.nodes.toMultiArrayList();

0 commit comments

Comments
 (0)