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

even moar!!! infix/prefix changes are the only ones remaining

Browse Source
This commit is contained in:
SuperAuguste 2020-07-16 12:07:21 -04:00
parent 20f440b3a0
commit 1d7fed7f87
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/analysis.zig
View File

@ -183,7 +183,7 @@ pub fn getDeclNameToken(tree: *ast.Tree, node: *ast.Node) ?ast.TokenIndex {
.FnProto => { .FnProto => {
const func = node.castTag(.FnProto).?; const func = node.castTag(.FnProto).?;
if (func.getTrailer("name_token") == null) return null; if (func.getTrailer("name_token") == null) return null;
return func.name_token.?; return func.getTrailer("name_token").?;
}, },
.ContainerField => { .ContainerField => {
const field = node.castTag(.ContainerField).?; const field = node.castTag(.ContainerField).?;
@ -971,7 +971,7 @@ pub fn collectImports(import_arr: *std.ArrayList([]const u8), tree: *ast.Tree) !
const var_decl = decl.castTag(.VarDecl).?; const var_decl = decl.castTag(.VarDecl).?;
if (!var_decl.trailer_flags.has("init_node")) continue; if (!var_decl.trailer_flags.has("init_node")) continue;
switch (var_decl.init_node.?.tag) { switch (var_decl.getTrailer("init_node").?.tag) {
.BuiltinCall => { .BuiltinCall => {
const builtin_call = var_decl.init_node.?.castTag(.BuiltinCall).?; const builtin_call = var_decl.init_node.?.castTag(.BuiltinCall).?;
try maybeCollectImport(tree, builtin_call, import_arr); try maybeCollectImport(tree, builtin_call, import_arr);
@ -2146,7 +2146,7 @@ fn makeScopeInternal(
} }
} }
if (func.body_node) |body| { if (func.getTrailer("body_node")) |body| {
try makeScopeInternal(allocator, scopes, error_completions, enum_completions, tree, body); try makeScopeInternal(allocator, scopes, error_completions, enum_completions, tree, body);
} }
@ -2438,10 +2438,10 @@ fn makeScopeInternal(
}, },
.VarDecl => { .VarDecl => {
const var_decl = node.castTag(.VarDecl).?; const var_decl = node.castTag(.VarDecl).?;
if (var_decl.type_node) |type_node| { if (var_decl.getTrailer("type_node")) |type_node| {
try makeScopeInternal(allocator, scopes, error_completions, enum_completions, tree, type_node); try makeScopeInternal(allocator, scopes, error_completions, enum_completions, tree, type_node);
} }
if (var_decl.init_node) |init_node| { if (var_decl.getTrailer("init_node")) |init_node| {
try makeScopeInternal(allocator, scopes, error_completions, enum_completions, tree, init_node); try makeScopeInternal(allocator, scopes, error_completions, enum_completions, tree, init_node);
} }
}, },

2
src/references.zig
View File

@ -395,7 +395,7 @@ pub fn symbolReferences(
std.log.warn(.references, "Could not find param decl's function", .{}); std.log.warn(.references, "Could not find param decl's function", .{});
return; return;
}; };
if (fn_node.body_node) |body| { if (fn_node.getTrailer("body_node")) |body| {
try symbolReferencesInternal(arena, store, .{ .node = body, .handle = curr_handle }, decl_handle, encoding, context, handler); try symbolReferencesInternal(arena, store, .{ .node = body, .handle = curr_handle }, decl_handle, encoding, context, handler);
} }
}, },