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

Fix crash when getting signature of optional

Browse Source 
e.g. typing 'foo.?.bar(' crashes zls because it doesn't recognize ? as a
possible token as part of a function expression, and tries to call
getFieldAccessType with '.bar' instead.

The actual fix is the one line in src/signature_help.zig

getFieldAccessType was reworked to be more resilient to this type of
thing - the `undefined` value of `current_type.type.data` was being used
since it hit the `.period` branch first. This caused the crash.
This commit is contained in:
Tom Cheng 2022-09-29 21:39:29 +01:00 committed by Tom Cheng
parent 7ef224467a
commit af14067911
2 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/analysis.zig
View File

@ -1154,10 +1154,7 @@ pub const FieldAccessReturn = struct {
}; };
pub fn getFieldAccessType(store: *DocumentStore, arena: *std.heap.ArenaAllocator, handle: *const DocumentStore.Handle, source_index: usize, tokenizer: *std.zig.Tokenizer) !?FieldAccessReturn { pub fn getFieldAccessType(store: *DocumentStore, arena: *std.heap.ArenaAllocator, handle: *const DocumentStore.Handle, source_index: usize, tokenizer: *std.zig.Tokenizer) !?FieldAccessReturn {
var current_type = TypeWithHandle.typeVal(.{ var current_type: ?TypeWithHandle = null;
.node = undefined,
.handle = handle,
});
var bound_type_params = BoundTypeParams{}; var bound_type_params = BoundTypeParams{};
@ -1165,14 +1162,15 @@ pub fn getFieldAccessType(store: *DocumentStore, arena: *std.heap.ArenaAllocator
const tok = tokenizer.next(); const tok = tokenizer.next();
switch (tok.tag) { switch (tok.tag) {
.eof => return FieldAccessReturn{ .eof => return FieldAccessReturn{
.original = current_type, .original = current_type orelse return null,
.unwrapped = try resolveDerefType(store, arena, current_type, &bound_type_params), .unwrapped = try resolveDerefType(store, arena, current_type orelse return null, &bound_type_params),
}, },
.identifier => { .identifier => {
const ct_handle = if (current_type) |c| c.handle else handle;
if (try lookupSymbolGlobal( if (try lookupSymbolGlobal(
store, store,
arena, arena,
current_type.handle, ct_handle,
tokenizer.buffer[tok.loc.start..tok.loc.end], tokenizer.buffer[tok.loc.start..tok.loc.end],
source_index, source_index,
)) |child| { )) |child| {
@ -1184,22 +1182,31 @@ pub fn getFieldAccessType(store: *DocumentStore, arena: *std.heap.ArenaAllocator
switch (after_period.tag) { switch (after_period.tag) {
.eof => { .eof => {
// function labels cannot be dot accessed // function labels cannot be dot accessed
if (current_type.isFunc()) return null; if (current_type) |ct| {
return FieldAccessReturn{ if (ct.isFunc()) return null;
.original = current_type, return FieldAccessReturn{
.unwrapped = try resolveDerefType(store, arena, current_type, &bound_type_params), .original = ct,
}; .unwrapped = try resolveDerefType(store, arena, ct, &bound_type_params),
};
} else {
return null;
}
}, },
.identifier => { .identifier => {
if (after_period.loc.end == tokenizer.buffer.len) { if (after_period.loc.end == tokenizer.buffer.len) {
return FieldAccessReturn{ if (current_type) |ct| {
.original = current_type, return FieldAccessReturn{
.unwrapped = try resolveDerefType(store, arena, current_type, &bound_type_params), .original = ct,
}; .unwrapped = try resolveDerefType(store, arena, ct, &bound_type_params),
};
} else {
return null;
}
} }
current_type = try resolveFieldAccessLhsType(store, arena, current_type, &bound_type_params); current_type = try resolveFieldAccessLhsType(store, arena, current_type orelse return null, &bound_type_params);
const current_type_node = switch (current_type.type.data) {
const current_type_node = switch (current_type.?.type.data) {
.other => |n| n, .other => |n| n,
else => return null, else => return null,
}; };
@ -1207,11 +1214,11 @@ pub fn getFieldAccessType(store: *DocumentStore, arena: *std.heap.ArenaAllocator
if (try lookupSymbolContainer( if (try lookupSymbolContainer(
store, store,
arena, arena,
.{ .node = current_type_node, .handle = current_type.handle }, .{ .node = current_type_node, .handle = current_type.?.handle },
tokenizer.buffer[after_period.loc.start..after_period.loc.end], tokenizer.buffer[after_period.loc.start..after_period.loc.end],
!current_type.type.is_type_val, !current_type.?.type.is_type_val,
)) |child| { )) |child| {
current_type = (try child.resolveType( current_type.? = (try child.resolveType(
store, store,
arena, arena,
&bound_type_params, &bound_type_params,
@ -1222,7 +1229,7 @@ pub fn getFieldAccessType(store: *DocumentStore, arena: *std.heap.ArenaAllocator
current_type = (try resolveUnwrapOptionalType( current_type = (try resolveUnwrapOptionalType(
store, store,
arena, arena,
current_type, current_type orelse return null,
&bound_type_params, &bound_type_params,
)) orelse return null; )) orelse return null;
}, },
@ -1236,19 +1243,22 @@ pub fn getFieldAccessType(store: *DocumentStore, arena: *std.heap.ArenaAllocator
current_type = (try resolveDerefType( current_type = (try resolveDerefType(
store, store,
arena, arena,
current_type, current_type orelse return null,
&bound_type_params, &bound_type_params,
)) orelse return null; )) orelse return null;
}, },
.l_paren => { .l_paren => {
const current_type_node = switch (current_type.type.data) { if (current_type == null) {
return null;
}
const current_type_node = switch (current_type.?.type.data) {
.other => |n| n, .other => |n| n,
else => return null, else => return null,
}; };
// Can't call a function type, we need a function type instance. // Can't call a function type, we need a function type instance.
if (current_type.type.is_type_val) return null; if (current_type.?.type.is_type_val) return null;
const cur_tree = current_type.handle.tree; const cur_tree = current_type.?.handle.tree;
var buf: [1]Ast.Node.Index = undefined; var buf: [1]Ast.Node.Index = undefined;
if (ast.fnProto(cur_tree, current_type_node, &buf)) |func| { if (ast.fnProto(cur_tree, current_type_node, &buf)) |func| {
// Check if the function has a body and if so, pass it // Check if the function has a body and if so, pass it
@ -1258,7 +1268,7 @@ pub fn getFieldAccessType(store: *DocumentStore, arena: *std.heap.ArenaAllocator
const body = cur_tree.nodes.items(.data)[current_type_node].rhs; const body = cur_tree.nodes.items(.data)[current_type_node].rhs;
// TODO Actually bind params here when calling functions instead of just skipping args. // TODO Actually bind params here when calling functions instead of just skipping args.
if (try resolveReturnType(store, arena, func, current_type.handle, &bound_type_params, if (has_body) body else null)) |ret| { if (try resolveReturnType(store, arena, func, current_type.?.handle, &bound_type_params, if (has_body) body else null)) |ret| {
current_type = ret; current_type = ret;
// Skip to the right paren // Skip to the right paren
var paren_count: usize = 1; var paren_count: usize = 1;
@ -1289,7 +1299,7 @@ pub fn getFieldAccessType(store: *DocumentStore, arena: *std.heap.ArenaAllocator
} }
} else return null; } else return null;
current_type = (try resolveBracketAccessType(store, arena, current_type, if (is_range) .Range else .Single, &bound_type_params)) orelse return null; current_type = (try resolveBracketAccessType(store, arena, current_type orelse return null, if (is_range) .Range else .Single, &bound_type_params)) orelse return null;
}, },
else => { else => {
log.debug("Unimplemented token: {}", .{tok.tag}); log.debug("Unimplemented token: {}", .{tok.tag});
@ -1298,10 +1308,14 @@ pub fn getFieldAccessType(store: *DocumentStore, arena: *std.heap.ArenaAllocator
} }
} }
return FieldAccessReturn{ if (current_type) |ct| {
.original = current_type, return FieldAccessReturn{
.unwrapped = try resolveDerefType(store, arena, current_type, &bound_type_params), .original = ct,
}; .unwrapped = try resolveDerefType(store, arena, ct, &bound_type_params),
};
} else {
return null;
}
} }
pub fn isNodePublic(tree: Ast, node: Ast.Node.Index) bool { pub fn isNodePublic(tree: Ast, node: Ast.Node.Index) bool {

1
src/signature_help.zig
View File

@ -237,6 +237,7 @@ pub fn getSignatureInfo(document_store: *DocumentStore, arena: *std.heap.ArenaAl
.r_paren => state = .{ .in_paren = 1 }, .r_paren => state = .{ .in_paren = 1 },
.identifier, .identifier,
.period, .period,
.question_mark,
.period_asterisk, .period_asterisk,
=> {}, => {},
else => break i + 1, else => break i + 1,