From 5dc7a1b40a7b732aa9229f12d0dcd4ed8bd8795a Mon Sep 17 00:00:00 2001 From: Alexandros Naskos Date: Sat, 23 May 2020 23:22:50 +0300 Subject: [PATCH 1/2] Fix @This() completions, do half the work in global completions --- src/analysis.zig | 105 +++++++++++++++++++++-------------------- src/document_store.zig | 22 +++------ src/main.zig | 26 +++++----- 3 files changed, 71 insertions(+), 82 deletions(-) diff --git a/src/analysis.zig b/src/analysis.zig index ec858de..8f44c72 100644 --- a/src/analysis.zig +++ b/src/analysis.zig @@ -262,17 +262,14 @@ fn findReturnStatement(base_node: *ast.Node) ?*ast.Node.ControlFlowExpression { } /// Resolves the return type of a function -fn resolveReturnType(analysis_ctx: *AnalysisContext, fn_decl: *ast.Node.FnProto) ?*ast.Node { +fn resolveReturnType(analysis_ctx: *AnalysisContext, fn_decl: *ast.Node.FnProto, current_container: *ast.Node) ?*ast.Node { if (isTypeFunction(analysis_ctx.tree, fn_decl) and fn_decl.body_node != null) { // If this is a type function and it only contains a single return statement that returns // a container declaration, we will return that declaration. const ret = findReturnStatement(fn_decl.body_node.?) orelse return null; if (ret.rhs) |rhs| - if (resolveTypeOfNode(analysis_ctx, rhs)) |res_rhs| switch (res_rhs.id) { - .ContainerDecl => { - analysis_ctx.onContainer(res_rhs.cast(ast.Node.ContainerDecl).?) catch return null; - return res_rhs; - }, + if (resolveTypeOfNode(analysis_ctx, rhs, current_container)) |res_rhs| switch (res_rhs.id) { + .ContainerDecl => return res_rhs, else => return null, }; @@ -280,44 +277,44 @@ fn resolveReturnType(analysis_ctx: *AnalysisContext, fn_decl: *ast.Node.FnProto) } return switch (fn_decl.return_type) { - .Explicit, .InferErrorSet => |return_type| resolveTypeOfNode(analysis_ctx, return_type), + .Explicit, .InferErrorSet => |return_type| resolveTypeOfNode(analysis_ctx, return_type, current_container), .Invalid => null, }; } /// Resolves the type of a node -pub fn resolveTypeOfNode(analysis_ctx: *AnalysisContext, node: *ast.Node) ?*ast.Node { +pub fn resolveTypeOfNode(analysis_ctx: *AnalysisContext, node: *ast.Node, current_container: *ast.Node) ?*ast.Node { switch (node.id) { .VarDecl => { const vari = node.cast(ast.Node.VarDecl).?; - return resolveTypeOfNode(analysis_ctx, vari.type_node orelse vari.init_node.?) orelse null; + return resolveTypeOfNode(analysis_ctx, vari.type_node orelse vari.init_node.?, current_container) orelse null; }, .ParamDecl => { const decl = node.cast(ast.Node.ParamDecl).?; switch (decl.param_type) { .var_type, .type_expr => |var_type| { - return resolveTypeOfNode(analysis_ctx, var_type) orelse null; + return resolveTypeOfNode(analysis_ctx, var_type, current_container) orelse null; }, else => {}, } }, .Identifier => { if (getChildOfSlice(analysis_ctx.tree, analysis_ctx.scope_nodes, analysis_ctx.tree.getNodeSource(node))) |child| { - return resolveTypeOfNode(analysis_ctx, child); + return resolveTypeOfNode(analysis_ctx, child, current_container); } else return null; }, .ContainerField => { const field = node.cast(ast.Node.ContainerField).?; - return resolveTypeOfNode(analysis_ctx, field.type_expr orelse return null); + return resolveTypeOfNode(analysis_ctx, field.type_expr orelse return null, current_container); }, .SuffixOp => { const suffix_op = node.cast(ast.Node.SuffixOp).?; switch (suffix_op.op) { .Call, .StructInitializer => { - const decl = resolveTypeOfNode(analysis_ctx, suffix_op.lhs.node) orelse return null; + const decl = resolveTypeOfNode(analysis_ctx, suffix_op.lhs.node, current_container) orelse return null; return switch (decl.id) { - .FnProto => resolveReturnType(analysis_ctx, decl.cast(ast.Node.FnProto).?), + .FnProto => resolveReturnType(analysis_ctx, decl.cast(ast.Node.FnProto).?, current_container), else => decl, }; }, @@ -333,8 +330,9 @@ pub fn resolveTypeOfNode(analysis_ctx: *AnalysisContext, node: *ast.Node) ?*ast. var rhs_str = nodeToString(analysis_ctx.tree, infix_op.rhs) orelse return null; // Use the analysis context temporary arena to store the rhs string. rhs_str = std.mem.dupe(&analysis_ctx.arena.allocator, u8, rhs_str) catch return null; - const left = resolveTypeOfNode(analysis_ctx, infix_op.lhs) orelse return null; - return resolveTypeOfNode(analysis_ctx, getChild(analysis_ctx.tree, left, rhs_str) orelse return null); + const left = resolveTypeOfNode(analysis_ctx, infix_op.lhs, current_container) orelse return null; + const child = getChild(analysis_ctx.tree, left, rhs_str) orelse return null; + return resolveTypeOfNode(analysis_ctx, child, current_container); }, else => {}, } @@ -346,13 +344,13 @@ pub fn resolveTypeOfNode(analysis_ctx: *AnalysisContext, node: *ast.Node) ?*ast. .PtrType => { const op_token = analysis_ctx.tree.tokens.at(prefix_op.op_token); switch (op_token.id) { - .Asterisk => return resolveTypeOfNode(analysis_ctx, prefix_op.rhs), + .Asterisk => return resolveTypeOfNode(analysis_ctx, prefix_op.rhs, current_container), .LBracket, .AsteriskAsterisk => return null, else => unreachable, } }, .Try => { - const rhs_type = resolveTypeOfNode(analysis_ctx, prefix_op.rhs) orelse return null; + const rhs_type = resolveTypeOfNode(analysis_ctx, prefix_op.rhs, current_container) orelse return null; switch (rhs_type.id) { .InfixOp => { const infix_op = rhs_type.cast(ast.Node.InfixOp).?; @@ -370,7 +368,7 @@ pub fn resolveTypeOfNode(analysis_ctx: *AnalysisContext, node: *ast.Node) ?*ast. const call_name = analysis_ctx.tree.tokenSlice(builtin_call.builtin_token); if (std.mem.eql(u8, call_name, "@This")) { if (builtin_call.params.len != 0) return null; - return analysis_ctx.last_this_node; + return current_container; } if (!std.mem.eql(u8, call_name, "@import")) return null; @@ -385,10 +383,7 @@ pub fn resolveTypeOfNode(analysis_ctx: *AnalysisContext, node: *ast.Node) ?*ast. break :block null; }; }, - .ContainerDecl => { - analysis_ctx.onContainer(node.cast(ast.Node.ContainerDecl).?) catch return null; - return node; - }, + .ContainerDecl => return node, .MultilineStringLiteral, .StringLiteral, .ErrorSetDecl, .FnProto => return node, else => std.debug.warn("Type resolution case not implemented; {}\n", .{node.id}), } @@ -441,7 +436,7 @@ pub fn getFieldAccessTypeNode( tokenizer: *std.zig.Tokenizer, line_length: usize, ) ?*ast.Node { - var current_node = &analysis_ctx.tree.root_node.base; + var current_node = analysis_ctx.in_container; while (true) { var next = tokenizer.next(); @@ -449,7 +444,7 @@ pub fn getFieldAccessTypeNode( .Eof => return current_node, .Identifier => { if (getChildOfSlice(analysis_ctx.tree, analysis_ctx.scope_nodes, tokenizer.buffer[next.start..next.end])) |child| { - if (resolveTypeOfNode(analysis_ctx, child)) |node_type| { + if (resolveTypeOfNode(analysis_ctx, child, current_node)) |node_type| { current_node = node_type; } else return null; } else return null; @@ -463,7 +458,7 @@ pub fn getFieldAccessTypeNode( if (after_period.end == line_length) return current_node; if (getChild(analysis_ctx.tree, current_node, tokenizer.buffer[after_period.start..after_period.end])) |child| { - if (resolveTypeOfNode(analysis_ctx, child)) |child_type| { + if (resolveTypeOfNode(analysis_ctx, child, current_node)) |child_type| { current_node = child_type; } else return null; } else return null; @@ -518,9 +513,16 @@ pub fn nodeToString(tree: *ast.Tree, node: *ast.Node) ?[]const u8 { return null; } -pub fn declsFromIndexInternal(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, node: *ast.Node, source_index: usize) error{OutOfMemory}!void { +pub fn declsFromIndexInternal( + decls: *std.ArrayList(*ast.Node), + tree: *ast.Tree, + node: *ast.Node, + container: **ast.Node, + source_index: usize, +) error{OutOfMemory}!void { switch (node.id) { .Root, .ContainerDecl => { + container.* = node; var node_index: usize = 0; while (node.iterate(node_index)) |child_node| : (node_index += 1) { // Skip over container fields, we can only dot access those. @@ -530,7 +532,7 @@ pub fn declsFromIndexInternal(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, // If the cursor is in a variable decls it will insert itself anyway, we don't need to take care of it. if ((is_contained and child_node.id != .VarDecl) or !is_contained) try decls.append(child_node); if (is_contained) { - try declsFromIndexInternal(decls, tree, child_node, source_index); + try declsFromIndexInternal(decls, tree, child_node, container, source_index); } } }, @@ -539,45 +541,45 @@ pub fn declsFromIndexInternal(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, var param_index: usize = 0; while (param_index < func.params.len) : (param_index += 1) - try declsFromIndexInternal(decls, tree, func.params.at(param_index).*, source_index); + try declsFromIndexInternal(decls, tree, func.params.at(param_index).*, container, source_index); if (func.body_node) |body_node| { if (!nodeContainsSourceIndex(tree, body_node, source_index)) return; - try declsFromIndexInternal(decls, tree, body_node, source_index); + try declsFromIndexInternal(decls, tree, body_node, container, source_index); } }, .TestDecl => { const test_decl = node.cast(ast.Node.TestDecl).?; if (!nodeContainsSourceIndex(tree, test_decl.body_node, source_index)) return; - try declsFromIndexInternal(decls, tree, test_decl.body_node, source_index); + try declsFromIndexInternal(decls, tree, test_decl.body_node, container, source_index); }, .Block => { var index: usize = 0; while (node.iterate(index)) |inode| : (index += 1) { if (nodeComesAfterSourceIndex(tree, inode, source_index)) return; - try declsFromIndexInternal(decls, tree, inode, source_index); + try declsFromIndexInternal(decls, tree, inode, container, source_index); } }, .Comptime => { const comptime_stmt = node.cast(ast.Node.Comptime).?; if (nodeComesAfterSourceIndex(tree, comptime_stmt.expr, source_index)) return; - try declsFromIndexInternal(decls, tree, comptime_stmt.expr, source_index); + try declsFromIndexInternal(decls, tree, comptime_stmt.expr, container, source_index); }, .If => { const if_node = node.cast(ast.Node.If).?; if (nodeContainsSourceIndex(tree, if_node.body, source_index)) { if (if_node.payload) |payload| { - try declsFromIndexInternal(decls, tree, payload, source_index); + try declsFromIndexInternal(decls, tree, payload, container, source_index); } - return try declsFromIndexInternal(decls, tree, if_node.body, source_index); + return try declsFromIndexInternal(decls, tree, if_node.body, container, source_index); } if (if_node.@"else") |else_node| { if (nodeContainsSourceIndex(tree, else_node.body, source_index)) { if (else_node.payload) |payload| { - try declsFromIndexInternal(decls, tree, payload, source_index); + try declsFromIndexInternal(decls, tree, payload, container, source_index); } - return try declsFromIndexInternal(decls, tree, else_node.body, source_index); + return try declsFromIndexInternal(decls, tree, else_node.body, container, source_index); } } }, @@ -585,33 +587,33 @@ pub fn declsFromIndexInternal(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, const while_node = node.cast(ast.Node.While).?; if (nodeContainsSourceIndex(tree, while_node.body, source_index)) { if (while_node.payload) |payload| { - try declsFromIndexInternal(decls, tree, payload, source_index); + try declsFromIndexInternal(decls, tree, payload, container, source_index); } - return try declsFromIndexInternal(decls, tree, while_node.body, source_index); + return try declsFromIndexInternal(decls, tree, while_node.body, container, source_index); } if (while_node.@"else") |else_node| { if (nodeContainsSourceIndex(tree, else_node.body, source_index)) { if (else_node.payload) |payload| { - try declsFromIndexInternal(decls, tree, payload, source_index); + try declsFromIndexInternal(decls, tree, payload, container, source_index); } - return try declsFromIndexInternal(decls, tree, else_node.body, source_index); + return try declsFromIndexInternal(decls, tree, else_node.body, container, source_index); } } }, .For => { const for_node = node.cast(ast.Node.For).?; if (nodeContainsSourceIndex(tree, for_node.body, source_index)) { - try declsFromIndexInternal(decls, tree, for_node.payload, source_index); - return try declsFromIndexInternal(decls, tree, for_node.body, source_index); + try declsFromIndexInternal(decls, tree, for_node.payload, container, source_index); + return try declsFromIndexInternal(decls, tree, for_node.body, container, source_index); } if (for_node.@"else") |else_node| { if (nodeContainsSourceIndex(tree, else_node.body, source_index)) { if (else_node.payload) |payload| { - try declsFromIndexInternal(decls, tree, payload, source_index); + try declsFromIndexInternal(decls, tree, payload, container, source_index); } - return try declsFromIndexInternal(decls, tree, else_node.body, source_index); + return try declsFromIndexInternal(decls, tree, else_node.body, container, source_index); } } }, @@ -622,9 +624,9 @@ pub fn declsFromIndexInternal(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, const case_node = case.*.cast(ast.Node.SwitchCase).?; if (nodeContainsSourceIndex(tree, case_node.expr, source_index)) { if (case_node.payload) |payload| { - try declsFromIndexInternal(decls, tree, payload, source_index); + try declsFromIndexInternal(decls, tree, payload, container, source_index); } - return try declsFromIndexInternal(decls, tree, case_node.expr, source_index); + return try declsFromIndexInternal(decls, tree, case_node.expr, container, source_index); } } }, @@ -642,7 +644,7 @@ pub fn declsFromIndexInternal(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, try decls.append(node); if (node.cast(ast.Node.VarDecl).?.init_node) |child| { if (nodeContainsSourceIndex(tree, child, source_index)) { - try declsFromIndexInternal(decls, tree, child, source_index); + try declsFromIndexInternal(decls, tree, child, container, source_index); } } }, @@ -658,9 +660,10 @@ pub fn addChildrenNodes(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, node: } } -pub fn declsFromIndex(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, source_index: usize) !void { - var node = &tree.root_node.base; - try declsFromIndexInternal(decls, tree, &tree.root_node.base, source_index); +pub fn declsFromIndex(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, source_index: usize) !*ast.Node { + var result = &tree.root_node.base; + try declsFromIndexInternal(decls, tree, &tree.root_node.base, &result, source_index); + return result; } fn nodeContainsSourceIndex(tree: *ast.Tree, node: *ast.Node, source_index: usize) bool { diff --git a/src/document_store.zig b/src/document_store.zig index 90a7c6d..f2c5faf 100644 --- a/src/document_store.zig +++ b/src/document_store.zig @@ -256,14 +256,14 @@ pub const AnalysisContext = struct { arena: *std.heap.ArenaAllocator, tree: *std.zig.ast.Tree, scope_nodes: []*std.zig.ast.Node, - last_this_node: *std.zig.ast.Node, + in_container: *std.zig.ast.Node, std_uri: ?[]const u8, fn refreshScopeNodes(self: *AnalysisContext) !void { var scope_nodes = std.ArrayList(*std.zig.ast.Node).init(&self.arena.allocator); try analysis.addChildrenNodes(&scope_nodes, self.tree, &self.tree.root_node.base); self.scope_nodes = scope_nodes.items; - self.last_this_node = &self.tree.root_node.base; + self.in_container = &self.tree.root_node.base; } pub fn onImport(self: *AnalysisContext, import_str: []const u8) !?*std.zig.ast.Node { @@ -355,21 +355,11 @@ pub const AnalysisContext = struct { .arena = self.arena, .tree = tree, .scope_nodes = self.scope_nodes, - .last_this_node = &tree.root_node.base, + .in_container = self.in_container, .std_uri = self.std_uri, }; } - pub fn onContainer(self: *AnalysisContext, container: *std.zig.ast.Node.ContainerDecl) !void { - if (self.last_this_node != &container.base) { - self.last_this_node = &container.base; - - var scope_nodes = std.ArrayList(*std.zig.ast.Node).init(&self.arena.allocator); - try analysis.addChildrenNodes(&scope_nodes, self.tree, &container.base); - self.scope_nodes = scope_nodes.items; - } - } - pub fn deinit(self: *AnalysisContext) void { self.tree.deinit(); } @@ -396,13 +386,13 @@ pub fn analysisContext( self: *DocumentStore, handle: *Handle, arena: *std.heap.ArenaAllocator, - position: types.Position, + position: usize, zig_lib_path: ?[]const u8, ) !AnalysisContext { const tree = try handle.tree(self.allocator); var scope_nodes = std.ArrayList(*std.zig.ast.Node).init(&arena.allocator); - try analysis.declsFromIndex(&scope_nodes, tree, try handle.document.positionToIndex(position)); + const in_container = try analysis.declsFromIndex(&scope_nodes, tree, position); const std_uri = try stdUriFromLibPath(&arena.allocator, zig_lib_path); return AnalysisContext{ @@ -411,7 +401,7 @@ pub fn analysisContext( .arena = arena, .tree = tree, .scope_nodes = scope_nodes.items, - .last_this_node = &tree.root_node.base, + .in_container = in_container, .std_uri = std_uri, }; } diff --git a/src/main.zig b/src/main.zig index d900c80..8fe326b 100644 --- a/src/main.zig +++ b/src/main.zig @@ -183,7 +183,7 @@ fn containerToCompletion( while (container.iterate(index)) |child_node| : (index += 1) { // Declarations in the same file do not need to be public. if (orig_handle == analysis_ctx.handle or analysis.isNodePublic(analysis_ctx.tree, child_node)) { - try nodeToCompletion(list, analysis_ctx, orig_handle, child_node, config); + try nodeToCompletion(list, analysis_ctx, orig_handle, child_node, container, config); } } } @@ -193,6 +193,7 @@ fn nodeToCompletion( analysis_ctx: *DocumentStore.AnalysisContext, orig_handle: *DocumentStore.Handle, node: *std.zig.ast.Node, + current_container: *std.zig.ast.Node, config: Config, ) error{OutOfMemory}!void { var doc = if (try analysis.getDocComments(list.allocator, analysis_ctx.tree, node)) |doc_comments| @@ -244,11 +245,11 @@ fn nodeToCompletion( break :block var_decl.init_node.?; }; - if (analysis.resolveTypeOfNode(&child_analysis_context, child_node)) |resolved_node| { + if (analysis.resolveTypeOfNode(&child_analysis_context, current_container, child_node)) |resolved_node| { // Special case for function aliases // In the future it might be used to print types of values instead of their declarations if (resolved_node.id == .FnProto) { - try nodeToCompletion(list, &child_analysis_context, orig_handle, resolved_node, config); + try nodeToCompletion(list, &child_analysis_context, orig_handle, resolved_node, current_container, config); return; } } @@ -325,7 +326,7 @@ fn gotoDefinitionGlobal(id: i64, pos_index: usize, handle: DocumentStore.Handle) defer arena.deinit(); var decl_nodes = std.ArrayList(*std.zig.ast.Node).init(&arena.allocator); - try analysis.declsFromIndex(&decl_nodes, tree, pos_index); + _ = try analysis.declsFromIndex(&decl_nodes, tree, pos_index); const decl = analysis.getChildOfSlice(tree, decl_nodes.items, name) orelse return try respondGeneric(id, null_result_response); const name_token = analysis.getDeclNameToken(tree, decl) orelse unreachable; @@ -355,7 +356,7 @@ fn gotoDefinitionFieldAccess( var arena = std.heap.ArenaAllocator.init(allocator); defer arena.deinit(); - var analysis_ctx = try document_store.analysisContext(handle, &arena, position, config.zig_lib_path); + var analysis_ctx = try document_store.analysisContext(handle, &arena, try handle.document.positionToIndex(position), config.zig_lib_path); defer analysis_ctx.deinit(); const line = try handle.document.getLine(@intCast(usize, position.line)); @@ -417,17 +418,12 @@ fn completeGlobal(id: i64, pos_index: usize, handle: *DocumentStore.Handle, conf // Deallocate all temporary data. defer arena.deinit(); - var analysis_ctx = try document_store.analysisContext(handle, &arena, types.Position{ - .line = 0, - .character = 0, - }, config.zig_lib_path); + var analysis_ctx = try document_store.analysisContext(handle, &arena, pos_index, config.zig_lib_path); defer analysis_ctx.deinit(); - var decl_nodes = std.ArrayList(*std.zig.ast.Node).init(&arena.allocator); - try analysis.declsFromIndex(&decl_nodes, analysis_ctx.tree, pos_index); - for (decl_nodes.items) |decl_ptr| { + for (analysis_ctx.scope_nodes) |decl_ptr| { var decl = decl_ptr.*; - try nodeToCompletion(&completions, &analysis_ctx, handle, decl_ptr, config); + try nodeToCompletion(&completions, &analysis_ctx, handle, decl_ptr, &analysis_ctx.tree.root_node.base, config); } try send(types.Response{ @@ -445,7 +441,7 @@ fn completeFieldAccess(id: i64, handle: *DocumentStore.Handle, position: types.P var arena = std.heap.ArenaAllocator.init(allocator); defer arena.deinit(); - var analysis_ctx = try document_store.analysisContext(handle, &arena, position, config.zig_lib_path); + var analysis_ctx = try document_store.analysisContext(handle, &arena, try handle.document.positionToIndex(position), config.zig_lib_path); defer analysis_ctx.deinit(); var completions = std.ArrayList(types.CompletionItem).init(&arena.allocator); @@ -455,7 +451,7 @@ fn completeFieldAccess(id: i64, handle: *DocumentStore.Handle, position: types.P const line_length = line.len - line_start_idx; if (analysis.getFieldAccessTypeNode(&analysis_ctx, &tokenizer, line_length)) |node| { - try nodeToCompletion(&completions, &analysis_ctx, handle, node, config); + try nodeToCompletion(&completions, &analysis_ctx, handle, node, node, config); } try send(types.Response{ .id = .{ .Integer = id }, From 22b5d2e2c3fd41402a8509d5c5734d3bbc3eb039 Mon Sep 17 00:00:00 2001 From: Alexandros Naskos Date: Sun, 24 May 2020 00:15:35 +0300 Subject: [PATCH 2/2] Pass the arguments in the correct order dummy --- src/main.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.zig b/src/main.zig index 8fe326b..9eb657c 100644 --- a/src/main.zig +++ b/src/main.zig @@ -245,7 +245,7 @@ fn nodeToCompletion( break :block var_decl.init_node.?; }; - if (analysis.resolveTypeOfNode(&child_analysis_context, current_container, child_node)) |resolved_node| { + if (analysis.resolveTypeOfNode(&child_analysis_context, child_node, current_container)) |resolved_node| { // Special case for function aliases // In the future it might be used to print types of values instead of their declarations if (resolved_node.id == .FnProto) {