andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1 level deep imports now work but we crash when adding levels

Browse Source
This commit is contained in:
Alexandros Naskos 2020-05-14 05:00:00 +03:00
parent 31f1d2fa3e
commit 86d264f488
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/document_store.zig
View File

@ -209,6 +209,11 @@ pub const ImportContext = struct {
handle: *Handle, handle: *Handle,
trees: std.ArrayList(*std.zig.ast.Tree), trees: std.ArrayList(*std.zig.ast.Tree),
pub fn lastTree(self: *ImportContext) *std.zig.ast.Tree {
std.debug.assert(self.trees.items.len > 0);
return self.trees.items[self.trees.items.len - 1];
}
pub fn onImport(self: *ImportContext, import_str: []const u8) !?*std.zig.ast.Node { pub fn onImport(self: *ImportContext, import_str: []const u8) !?*std.zig.ast.Node {
const allocator = self.store.allocator; const allocator = self.store.allocator;

2
src/main.zig
View File

@ -282,7 +282,7 @@ fn completeFieldAccess(id: i64, handle: *DocumentStore.Handle, position: types.P
if (analysis.getFieldAccessTypeNode(tree, &tokenizer, &import_ctx)) |node| { if (analysis.getFieldAccessTypeNode(tree, &tokenizer, &import_ctx)) |node| {
var index: usize = 0; var index: usize = 0;
while (node.iterate(index)) |child_node| { while (node.iterate(index)) |child_node| {
if (try nodeToCompletion(&arena.allocator, tree, child_node, config)) |completion| { if (try nodeToCompletion(&arena.allocator, import_ctx.lastTree(), child_node, config)) |completion| {
try completions.append(completion); try completions.append(completion);
} }
index += 1; index += 1;