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

Added hack to support ParamDecl not being a node anymore

Browse Source
This commit is contained in:
Alexandros Naskos 2020-05-24 17:31:28 +03:00
parent 594488d7c5
commit fd069b026a
3 changed files with 53 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/analysis.zig
View File

@ -51,13 +51,6 @@ pub fn getDocComments(allocator: *std.mem.Allocator, tree: *ast.Tree, node: *ast
return try collectDocComments(allocator, tree, doc_comments); return try collectDocComments(allocator, tree, doc_comments);
} }
}, },
// @TODO: ParamDecl is no longer a node.
// .ParamDecl => {
// const param = node.cast(ast.Node.ParamDecl).?;
// if (param.doc_comments) |doc_comments| {
// return try collectDocComments(allocator, tree, doc_comments);
// }
// },
else => {}, else => {},
} }
return null; return null;
@ -153,13 +146,6 @@ pub fn getVariableSignature(tree: *ast.Tree, var_decl: *ast.Node.VarDecl) []cons
return tree.source[start..end]; return tree.source[start..end];
} }
/// Gets a param signature
pub fn getParamSignature(tree: *ast.Tree, param: *ast.Node.ParamDecl) []const u8 {
const start = tree.tokens.at(param.firstToken()).start;
const end = tree.tokens.at(param.lastToken()).end;
return tree.source[start..end];
}
pub fn isTypeFunction(tree: *ast.Tree, func: *ast.Node.FnProto) bool { pub fn isTypeFunction(tree: *ast.Tree, func: *ast.Node.FnProto) bool {
switch (func.return_type) { switch (func.return_type) {
.Explicit => |node| return if (node.cast(std.zig.ast.Node.Identifier)) |ident| .Explicit => |node| return if (node.cast(std.zig.ast.Node.Identifier)) |ident|
@ -188,12 +174,6 @@ pub fn getDeclNameToken(tree: *ast.Tree, node: *ast.Node) ?ast.TokenIndex {
const vari = node.cast(ast.Node.VarDecl).?; const vari = node.cast(ast.Node.VarDecl).?;
return vari.name_token; return vari.name_token;
}, },
// @TODO Param decl is no longer a node
// .ParamDecl => {
// const decl = node.cast(ast.Node.ParamDecl).?;
// if (decl.name_token == null) return null;
// return decl.name_token.?;
// },
.FnProto => { .FnProto => {
const func = node.cast(ast.Node.FnProto).?; const func = node.cast(ast.Node.FnProto).?;
if (func.name_token == null) return null; if (func.name_token == null) return null;
@ -312,16 +292,6 @@ pub fn resolveTypeOfNode(analysis_ctx: *AnalysisContext, node: *ast.Node) ?*ast.
return resolveTypeOfNode(analysis_ctx, vari.type_node orelse vari.init_node.?) orelse null; return resolveTypeOfNode(analysis_ctx, vari.type_node orelse vari.init_node.?) orelse null;
}, },
// @TODO Param decl is no longer a node type.
// .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;
// },
// else => {},
// }
// },
.Identifier => { .Identifier => {
if (getChildOfSlice(analysis_ctx.tree, analysis_ctx.scope_nodes, analysis_ctx.tree.getNodeSource(node))) |child| { 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);
@ -579,6 +549,7 @@ pub fn nodeToString(tree: *ast.Tree, node: *ast.Node) ?[]const u8 {
} }
pub fn declsFromIndexInternal( pub fn declsFromIndexInternal(
arena: *std.heap.ArenaAllocator,
decls: *std.ArrayList(*ast.Node), decls: *std.ArrayList(*ast.Node),
tree: *ast.Tree, tree: *ast.Tree,
node: *ast.Node, node: *ast.Node,
@ -597,54 +568,78 @@ pub fn declsFromIndexInternal(
// If the cursor is in a variable decls it will insert itself anyway, we don't need to take care of it. // 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 and child_node.id != .VarDecl) or !is_contained) try decls.append(child_node);
if (is_contained) { if (is_contained) {
try declsFromIndexInternal(decls, tree, child_node, container, source_index); try declsFromIndexInternal(arena, decls, tree, child_node, container, source_index);
} }
} }
}, },
.FnProto => { .FnProto => {
const func = node.cast(ast.Node.FnProto).?; const func = node.cast(ast.Node.FnProto).?;
// @TODO Param decls are no longer nodes. // TODO: This is a hack to enable param decls with the new parser
// for (func.paramsConst()) |param| { for (func.paramsConst()) |param| {
// } if (param.name_token) |name_token| {
const var_decl_node = try arena.allocator.create(ast.Node.VarDecl);
var_decl_node.* = .{
.doc_comments = param.doc_comments,
.comptime_token = param.comptime_token,
.visib_token = null,
.thread_local_token = null,
.name_token = name_token,
.eq_token = null,
.mut_token = name_token, // TODO: better tokens for mut_token. semicolon_token?
.extern_export_token = null,
.lib_name = null,
.type_node = switch (param.param_type) {
.type_expr => |t| t,
else => null,
},
.align_node = null,
.section_node = null,
.init_node = null,
.semicolon_token = name_token,
};
try decls.append(&var_decl_node.base);
}
}
if (func.body_node) |body_node| { if (func.body_node) |body_node| {
if (!nodeContainsSourceIndex(tree, body_node, source_index)) return; if (!nodeContainsSourceIndex(tree, body_node, source_index)) return;
try declsFromIndexInternal(decls, tree, body_node, container, source_index); try declsFromIndexInternal(arena, decls, tree, body_node, container, source_index);
} }
}, },
.TestDecl => { .TestDecl => {
const test_decl = node.cast(ast.Node.TestDecl).?; const test_decl = node.cast(ast.Node.TestDecl).?;
if (!nodeContainsSourceIndex(tree, test_decl.body_node, source_index)) return; if (!nodeContainsSourceIndex(tree, test_decl.body_node, source_index)) return;
try declsFromIndexInternal(decls, tree, test_decl.body_node, container, source_index); try declsFromIndexInternal(arena, decls, tree, test_decl.body_node, container, source_index);
}, },
.Block => { .Block => {
var inode_idx: usize = 0; var inode_idx: usize = 0;
while (node.iterate(inode_idx)) |inode| : (inode_idx += 1) { while (node.iterate(inode_idx)) |inode| : (inode_idx += 1) {
if (nodeComesAfterSourceIndex(tree, inode, source_index)) return; if (nodeComesAfterSourceIndex(tree, inode, source_index)) return;
try declsFromIndexInternal(decls, tree, inode, container, source_index); try declsFromIndexInternal(arena, decls, tree, inode, container, source_index);
} }
}, },
.Comptime => { .Comptime => {
const comptime_stmt = node.cast(ast.Node.Comptime).?; const comptime_stmt = node.cast(ast.Node.Comptime).?;
if (nodeComesAfterSourceIndex(tree, comptime_stmt.expr, source_index)) return; if (nodeComesAfterSourceIndex(tree, comptime_stmt.expr, source_index)) return;
try declsFromIndexInternal(decls, tree, comptime_stmt.expr, container, source_index); try declsFromIndexInternal(arena, decls, tree, comptime_stmt.expr, container, source_index);
}, },
.If => { .If => {
const if_node = node.cast(ast.Node.If).?; const if_node = node.cast(ast.Node.If).?;
if (nodeContainsSourceIndex(tree, if_node.body, source_index)) { if (nodeContainsSourceIndex(tree, if_node.body, source_index)) {
if (if_node.payload) |payload| { if (if_node.payload) |payload| {
try declsFromIndexInternal(decls, tree, payload, container, source_index); try declsFromIndexInternal(arena, decls, tree, payload, container, source_index);
} }
return try declsFromIndexInternal(decls, tree, if_node.body, container, source_index); return try declsFromIndexInternal(arena, decls, tree, if_node.body, container, source_index);
} }
if (if_node.@"else") |else_node| { if (if_node.@"else") |else_node| {
if (nodeContainsSourceIndex(tree, else_node.body, source_index)) { if (nodeContainsSourceIndex(tree, else_node.body, source_index)) {
if (else_node.payload) |payload| { if (else_node.payload) |payload| {
try declsFromIndexInternal(decls, tree, payload, container, source_index); try declsFromIndexInternal(arena, decls, tree, payload, container, source_index);
} }
return try declsFromIndexInternal(decls, tree, else_node.body, container, source_index); return try declsFromIndexInternal(arena, decls, tree, else_node.body, container, source_index);
} }
} }
}, },
@ -652,33 +647,33 @@ pub fn declsFromIndexInternal(
const while_node = node.cast(ast.Node.While).?; const while_node = node.cast(ast.Node.While).?;
if (nodeContainsSourceIndex(tree, while_node.body, source_index)) { if (nodeContainsSourceIndex(tree, while_node.body, source_index)) {
if (while_node.payload) |payload| { if (while_node.payload) |payload| {
try declsFromIndexInternal(decls, tree, payload, container, source_index); try declsFromIndexInternal(arena, decls, tree, payload, container, source_index);
} }
return try declsFromIndexInternal(decls, tree, while_node.body, container, source_index); return try declsFromIndexInternal(arena, decls, tree, while_node.body, container, source_index);
} }
if (while_node.@"else") |else_node| { if (while_node.@"else") |else_node| {
if (nodeContainsSourceIndex(tree, else_node.body, source_index)) { if (nodeContainsSourceIndex(tree, else_node.body, source_index)) {
if (else_node.payload) |payload| { if (else_node.payload) |payload| {
try declsFromIndexInternal(decls, tree, payload, container, source_index); try declsFromIndexInternal(arena, decls, tree, payload, container, source_index);
} }
return try declsFromIndexInternal(decls, tree, else_node.body, container, source_index); return try declsFromIndexInternal(arena, decls, tree, else_node.body, container, source_index);
} }
} }
}, },
.For => { .For => {
const for_node = node.cast(ast.Node.For).?; const for_node = node.cast(ast.Node.For).?;
if (nodeContainsSourceIndex(tree, for_node.body, source_index)) { if (nodeContainsSourceIndex(tree, for_node.body, source_index)) {
try declsFromIndexInternal(decls, tree, for_node.payload, container, source_index); try declsFromIndexInternal(arena, decls, tree, for_node.payload, container, source_index);
return try declsFromIndexInternal(decls, tree, for_node.body, container, source_index); return try declsFromIndexInternal(arena, decls, tree, for_node.body, container, source_index);
} }
if (for_node.@"else") |else_node| { if (for_node.@"else") |else_node| {
if (nodeContainsSourceIndex(tree, else_node.body, source_index)) { if (nodeContainsSourceIndex(tree, else_node.body, source_index)) {
if (else_node.payload) |payload| { if (else_node.payload) |payload| {
try declsFromIndexInternal(decls, tree, payload, container, source_index); try declsFromIndexInternal(arena, decls, tree, payload, container, source_index);
} }
return try declsFromIndexInternal(decls, tree, else_node.body, container, source_index); return try declsFromIndexInternal(arena, decls, tree, else_node.body, container, source_index);
} }
} }
}, },
@ -688,9 +683,9 @@ pub fn declsFromIndexInternal(
const case_node = case.*.cast(ast.Node.SwitchCase).?; const case_node = case.*.cast(ast.Node.SwitchCase).?;
if (nodeContainsSourceIndex(tree, case_node.expr, source_index)) { if (nodeContainsSourceIndex(tree, case_node.expr, source_index)) {
if (case_node.payload) |payload| { if (case_node.payload) |payload| {
try declsFromIndexInternal(decls, tree, payload, container, source_index); try declsFromIndexInternal(arena, decls, tree, payload, container, source_index);
} }
return try declsFromIndexInternal(decls, tree, case_node.expr, container, source_index); return try declsFromIndexInternal(arena, decls, tree, case_node.expr, container, source_index);
} }
} }
}, },
@ -708,7 +703,7 @@ pub fn declsFromIndexInternal(
try decls.append(node); try decls.append(node);
if (node.cast(ast.Node.VarDecl).?.init_node) |child| { if (node.cast(ast.Node.VarDecl).?.init_node) |child| {
if (nodeContainsSourceIndex(tree, child, source_index)) { if (nodeContainsSourceIndex(tree, child, source_index)) {
try declsFromIndexInternal(decls, tree, child, container, source_index); try declsFromIndexInternal(arena, decls, tree, child, container, source_index);
} }
} }
}, },
@ -723,9 +718,9 @@ 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) !*ast.Node { pub fn declsFromIndex(arena: *std.heap.ArenaAllocator, decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, source_index: usize) !*ast.Node {
var result = &tree.root_node.base; var result = &tree.root_node.base;
try declsFromIndexInternal(decls, tree, &tree.root_node.base, &result, source_index); try declsFromIndexInternal(arena, decls, tree, &tree.root_node.base, &result, source_index);
return result; return result;
} }

2
src/document_store.zig
View File

@ -402,7 +402,7 @@ pub fn analysisContext(
const tree = try handle.tree(self.allocator); const tree = try handle.tree(self.allocator);
var scope_nodes = std.ArrayList(*std.zig.ast.Node).init(&arena.allocator); var scope_nodes = std.ArrayList(*std.zig.ast.Node).init(&arena.allocator);
const in_container = try analysis.declsFromIndex(&scope_nodes, tree, position); const in_container = try analysis.declsFromIndex(arena, &scope_nodes, tree, position);
const std_uri = try stdUriFromLibPath(&arena.allocator, zig_lib_path); const std_uri = try stdUriFromLibPath(&arena.allocator, zig_lib_path);
return AnalysisContext{ return AnalysisContext{

13
src/main.zig
View File

@ -256,17 +256,6 @@ fn nodeToCompletion(
.detail = analysis.getVariableSignature(analysis_ctx.tree, var_decl), .detail = analysis.getVariableSignature(analysis_ctx.tree, var_decl),
}); });
}, },
// @TODO: No more ParamDecl node.
// .ParamDecl => {
// const param = node.cast(std.zig.ast.Node.ParamDecl).?;
// if (param.name_token) |name_token|
// try list.append(.{
// .label = analysis_ctx.tree.tokenSlice(name_token),
// .kind = .Constant,
// .documentation = doc,
// .detail = analysis.getParamSignature(analysis_ctx.tree, param),
// });
// },
.PrefixOp => { .PrefixOp => {
try list.append(.{ try list.append(.{
.label = "len", .label = "len",
@ -323,7 +312,7 @@ fn gotoDefinitionGlobal(id: i64, pos_index: usize, handle: DocumentStore.Handle)
defer arena.deinit(); defer arena.deinit();
var decl_nodes = std.ArrayList(*std.zig.ast.Node).init(&arena.allocator); var decl_nodes = std.ArrayList(*std.zig.ast.Node).init(&arena.allocator);
_ = try analysis.declsFromIndex(&decl_nodes, tree, pos_index); _ = try analysis.declsFromIndex(&arena, &decl_nodes, tree, pos_index);
const decl = analysis.getChildOfSlice(tree, decl_nodes.items, name) orelse return try respondGeneric(id, null_result_response); 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; const name_token = analysis.getDeclNameToken(tree, decl) orelse unreachable;