Merge pull request #19333 from Vexu/fixes

Miscellaneous error fixes
This commit is contained in:
Andrew Kelley
2024-03-17 15:26:55 -07:00
committed by GitHub
7 changed files with 187 additions and 150 deletions

View File

@@ -1897,8 +1897,11 @@ pub const SrcLoc = struct {
const parent_node = src_loc.declRelativeToNodeIndex(node_off);
var buf: [2]Ast.Node.Index = undefined;
const full = tree.fullArrayInit(&buf, parent_node).?;
return tree.nodeToSpan(full.ast.type_expr);
const type_expr = if (tree.fullArrayInit(&buf, parent_node)) |array_init|
array_init.ast.type_expr
else
tree.fullStructInit(&buf, parent_node).?.ast.type_expr;
return tree.nodeToSpan(type_expr);
},
.node_offset_store_ptr => |node_off| {
const tree = try src_loc.file_scope.getTree(gpa);