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

Dont use variable decl init node blindly

Browse Source
This commit is contained in:
Alexandros Naskos 2020-06-28 16:08:15 +03:00
parent 965724dd7e
commit 3be74cbdc5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/analysis.zig
View File

@ -276,6 +276,7 @@ pub fn resolveVarDeclAlias(store: *DocumentStore, arena: *std.heap.ArenaAllocato
if (decl.cast(ast.Node.VarDecl)) |var_decl| { if (decl.cast(ast.Node.VarDecl)) |var_decl| {
if (var_decl.init_node == null) return null; if (var_decl.init_node == null) return null;
if (handle.tree.token_ids[var_decl.mut_token] != .Keyword_const) return null; if (handle.tree.token_ids[var_decl.mut_token] != .Keyword_const) return null;
if (var_decl.init_node == null) return null;
const base_expr = var_decl.init_node.?; const base_expr = var_decl.init_node.?;
if (base_expr.cast(ast.Node.InfixOp)) |infix_op| { if (base_expr.cast(ast.Node.InfixOp)) |infix_op| {
@ -577,6 +578,7 @@ pub fn resolveTypeOfNodeInternal(
bound_type_params, bound_type_params,
)) orelse break :block).instanceTypeVal(); )) orelse break :block).instanceTypeVal();
} }
if (vari.init_node == null) return null;
return try resolveTypeOfNodeInternal(store, arena, .{ .node = vari.init_node.?, .handle = handle }, bound_type_params); return try resolveTypeOfNodeInternal(store, arena, .{ .node = vari.init_node.?, .handle = handle }, bound_type_params);
}, },