Skip to content

Commit e36079f

Browse files
committed
Splice zig's parser into zls
1 parent 0fb7651 commit e36079f

File tree

6 files changed

+19127
-2
lines changed

6 files changed

+19127
-2
lines changed

src/DocumentStore.zig

+10-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const Config = @import("Config.zig");
1212
const ZigVersionWrapper = @import("ZigVersionWrapper.zig");
1313
const translate_c = @import("translate_c.zig");
1414
const ComptimeInterpreter = @import("ComptimeInterpreter.zig");
15+
const Parser = @import("stage2/Ast.zig");
1516
const AstGen = @import("stage2/AstGen.zig");
1617
const Zir = @import("stage2/Zir.zig");
1718
const InternPool = @import("analyser/InternPool.zig");
@@ -486,8 +487,15 @@ pub const Handle = struct {
486487
const tracy_zone_inner = tracy.traceNamed(@src(), "Ast.parse");
487488
defer tracy_zone_inner.end();
488489

489-
var tree = try Ast.parse(allocator, new_text, .zig);
490-
errdefer tree.deinit(allocator);
490+
var zls_ast = try Parser.parse(allocator, new_text, .zig);
491+
errdefer zls_ast.deinit(allocator);
492+
var tree = Ast{
493+
.source = zls_ast.source,
494+
.tokens = zls_ast.tokens,
495+
.nodes = zls_ast.nodes,
496+
.extra_data = zls_ast.extra_data,
497+
.errors = zls_ast.errors,
498+
};
491499

492500
// remove unused capacity
493501
var nodes = tree.nodes.toMultiArrayList();

0 commit comments

Comments
 (0)