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

Fix crash when using param identifier in the same param's type expression

Browse Source
This commit is contained in:
Alexandros Naskos 2020-06-23 12:15:18 +03:00
parent c8223b3a07
commit c8af53ef7a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/analysis.zig
View File

@ -582,6 +582,8 @@ pub fn resolveTypeOfNodeInternal(
if (try lookupSymbolGlobal(store, arena, handle, handle.tree.getNodeSource(node), handle.tree.token_locs[node.firstToken()].start)) |child| { if (try lookupSymbolGlobal(store, arena, handle, handle.tree.getNodeSource(node), handle.tree.token_locs[node.firstToken()].start)) |child| {
switch (child.decl.*) { switch (child.decl.*) {
.ast_node => |n| if (n == node) return null, .ast_node => |n| if (n == node) return null,
// @TODO
.param_decl => |p_decl| {},
else => {}, else => {},
} }
return try child.resolveType(store, arena, bound_type_params); return try child.resolveType(store, arena, bound_type_params);
@ -1449,6 +1451,11 @@ pub const DeclWithHandle = struct {
if (entry.key == param_decl) return entry.value; if (entry.key == param_decl) return entry.value;
} }
return null; return null;
} else if (type_node.cast(ast.Node.Identifier)) |type_ident| {
if (param_decl.name_token) |name_tok| {
if (std.mem.eql(u8, self.handle.tree.tokenSlice(type_ident.firstToken()), self.handle.tree.tokenSlice(name_tok)))
return null;
}
} }
return ((try resolveTypeOfNodeInternal( return ((try resolveTypeOfNodeInternal(
store, store,