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

Fixed infinite loop

Browse Source
This commit is contained in:
Alexandros Naskos 2020-06-18 03:23:56 +03:00
parent 5e7fc18404
commit 6c718a59c4
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/analysis.zig
View File

@ -580,6 +580,10 @@ fn resolveTypeOfNodeInternal(
}
if (try lookupSymbolGlobal(store, arena, handle, handle.tree.getNodeSource(node), handle.tree.token_locs[node.firstToken()].start)) |child| {
switch(child.decl.*) {
.ast_node => |n| if (n == node) return null,
else => {},
}
return try child.resolveType(store, arena, bound_type_params);
}
return null;

33
src/semantic_tokens.zig
View File

@ -254,21 +254,24 @@ fn writeNodeTokens(builder: *Builder, arena: *std.heap.ArenaAllocator, store: *D
return try writeToken(builder, node.firstToken(), .parameter);
}
// TODO: Clean this up.
// @TODO This stack overflows
// var bound_type_params = analysis.BoundTypeParams.init(&arena.allocator);
// if (try child.resolveType(store, arena, &bound_type_params)) |decl_type| {
// if (decl_type.type.is_type_val) {
// const tok_type = if (decl_type.isStructType())
// .@"struct"
// else if (decl_type.isEnumType())
// .@"enum"
// else if (decl_type.isUnionType())
// .@"union"
// else
// TokenType.type;
// return try writeTokenMod(builder, node.firstToken(), tok_type, .{});
// }
// }
var bound_type_params = analysis.BoundTypeParams.init(&arena.allocator);
var resolve_type_frame = try arena.child_allocator.alignedAlloc(u8, std.Target.stack_align, @sizeOf(@Frame(analysis.DeclWithHandle.resolveType)));
defer arena.child_allocator.free(resolve_type_frame);
if (try child.resolveType(store, arena, &bound_type_params)) |decl_type| {
if (decl_type.type.is_type_val) {
const tok_type = if (decl_type.isStructType())
.@"struct"
else if (decl_type.isEnumType())
.@"enum"
else if (decl_type.isUnionType())
.@"union"
else
TokenType.type;
return try writeTokenMod(builder, node.firstToken(), tok_type, .{});
}
}
}
},
.FnProto => {