Update to the latest zig and zls master (#138)

Author: KurtWagner

build.zig.zon

@@ -7,8 +7,8 @@
         .zls = .{
             // Update with `zig fetch --save git+https://github.com/zigtools/zls#master`
             // IF changed THEN update .github/coverage.yml
-            .url = "git+https://github.com/zigtools/zls?ref=master#25360ab5a94f61a4136efbdb76940286f27465dc",
-            .hash = "zls-0.16.0-dev-rmm5fhreJAA7il8TZE_z88mOj1AuMDMxfy5I1ozf8fAH",
+            .url = "git+https://github.com/zigtools/zls?ref=master#246f9387629c82a2cfd51ee1f7895d7c9db39b47",
+            .hash = "zls-0.16.0-dev-rmm5fmdBJQCoJBgNx4V7WbbtQsd33XHFSs2sqwX9IvCb",
         },
     },
     .paths = .{

src/lib/ast.zig

@@ -62,47 +62,16 @@ pub fn nodeChildrenAlloc(
     tree: *const Ast,
     node: Ast.Node.Index,
 ) error{OutOfMemory}![]Ast.Node.Index {
-    const Context = struct {
-        gpa: std.mem.Allocator,
-        children: *std.ArrayList(Ast.Node.Index),
-
-        fn callback(self: @This(), _: *const Ast, child_node: Ast.Node.Index) error{OutOfMemory}!void {
-            if (NodeIndexShim.init(child_node).isRoot()) return;
-            try self.children.append(self.gpa, child_node);
-        }
-    };
-
     var children: std.ArrayList(Ast.Node.Index) = .empty;
     defer children.deinit(gpa);
 
-    try iterateChildren(
-        tree,
-        node,
-        Context{
-            .gpa = gpa,
-            .children = &children,
-        },
-        error{OutOfMemory},
-        Context.callback,
-    );
-    return children.toOwnedSlice(gpa);
-}
-
-/// Temporary work around to bug in zls 0.14 that's now fixed in zls master.
-/// I don't see the point in upstreaming the fix to the ZLS 0.14 branch so
-/// leaving this simple work around in place while we support 0.14 and then it
-/// can be deleted.
-pub inline fn iterateChildren(
-    tree: *const Ast,
-    node: Ast.Node.Index,
-    context: anytype,
-    comptime Error: type,
-    comptime callback: fn (@TypeOf(context), *const Ast, Ast.Node.Index) Error!void,
-) Error!void {
-    switch (version.zig) {
-        .@"0.14", .@"0.15" => @panic("Not implemented"),
-        .@"0.16" => try zls.ast.iterateChildren(tree, node, context, Error, callback),
+    var it = zls.ast.Iterator.init(tree, node);
+    while (it.next(tree)) |child_node| {
+        std.debug.assert(child_node != .root);
+        try children.append(gpa, child_node);
     }
+
+    return children.toOwnedSlice(gpa);
 }
 
 /// `errdefer` and `defer` calls

src/lib/explorer.zig

@@ -68,7 +68,7 @@ pub fn jsonTree(
             // e.g., the "data" union structures
 
             var node_children = std.json.Array.init(self.arena);
-            try ast.iterateChildren(
+            try iterateChildren(
                 context_tree,
                 child_node,
                 @This(){
@@ -98,7 +98,7 @@ pub fn jsonTree(
     var root_node_children = std.json.Array.init(arena);
 
     if (tree.errors.len == 0) {
-        try ast.iterateChildren(
+        try iterateChildren(
             &tree,
             NodeIndexShim.root.toNodeIndex(),
             Context{
@@ -116,6 +116,19 @@ pub fn jsonTree(
     return std.json.Value{ .object = root_json_object };
 }
 
+fn iterateChildren(
+    tree: *const Ast,
+    node: Ast.Node.Index,
+    context: anytype,
+    comptime Error: type,
+    comptime callback: fn (@TypeOf(context), *const Ast, Ast.Node.Index) Error!void,
+) Error!void {
+    var it = zls.ast.Iterator.init(tree, node);
+    while (it.next(tree)) |child_node| {
+        try callback(context, tree, child_node);
+    }
+}
+
 fn errorsToJson(tree: Ast, arena: std.mem.Allocator) !std.json.Array {
     var json_errors = std.json.Array.init(arena);
 
@@ -187,3 +200,4 @@ const std = @import("std");
 const version = @import("version.zig");
 const NodeIndexShim = shims.NodeIndexShim;
 const Ast = std.zig.Ast;
+const zls = @import("zls");