Skip to content

Commit

Permalink
ensure that tuple types are always resolve to Analyser.Type.Data.tuple
Browse files Browse the repository at this point in the history 
This change also ensures that the field types always have
`is_type_val == true` which unfortunately regresses the ability to
destructure tuple that are made of types.
  • Loading branch information
@Techatrix
Techatrix committed Feb 9, 2025
1 parent 0c335bd commit 410877a
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 96 deletions.
96 changes: 45 additions & 51 deletions src/analysis.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1122,40 +1122,13 @@ fn resolveBracketAccessType(analyser: *Analyser, lhs: Type, rhs: BracketAccessKi
}

pub fn resolveTupleFieldType(analyser: *Analyser, tuple: Type, index: usize) error{OutOfMemory}!?Type {
const scope_handle = switch (tuple.data) {
.container => |s| s,
.tuple => |elem_ty_slice| {
if (index >= elem_ty_slice.len) return null;
return elem_ty_slice[index];
switch (tuple.data) {
.tuple => |fields| {
if (index >= fields.len) return null;
return fields[index].instanceTypeVal(analyser);
},
else => return null,
};
const node = scope_handle.toNode();
const handle = scope_handle.handle;
const tree = handle.tree;
const main_tokens = tree.nodes.items(.main_token);
const token_tags = tree.tokens.items(.tag);

if (token_tags[main_tokens[node]] != .keyword_struct)
return null;

var buf: [2]Ast.Node.Index = undefined;
const container_decl = tree.fullContainerDecl(&buf, node) orelse
return null;

if (index >= container_decl.ast.members.len)
return null;

const field = tree.fullContainerField(container_decl.ast.members[index]) orelse
return null;

if (!field.ast.tuple_like)
return null;

if (try analyser.resolveTypeOfNode(.{ .node = field.ast.type_expr, .handle = handle })) |ty|
return try ty.instanceTypeVal(analyser);

return null;
}
}

fn resolvePropertyType(analyser: *Analyser, ty: Type, name: []const u8) error{OutOfMemory}!?Type {
Expand Down Expand Up @@ -1204,7 +1177,7 @@ fn resolvePropertyType(analyser: *Analyser, ty: Type, name: []const u8) error{Ou
.tuple => {
if (!allDigits(name)) return null;
const index = std.fmt.parseInt(u16, name, 10) catch return null;
return analyser.resolveTupleFieldType(ty, index);
return try analyser.resolveTupleFieldType(ty, index);
},

.optional => |child_ty| {
Expand All @@ -1213,20 +1186,7 @@ fn resolvePropertyType(analyser: *Analyser, ty: Type, name: []const u8) error{Ou
}
},

.container => |scope_handle| switch (scope_handle.handle.tree.nodes.items(.tag)[scope_handle.toNode()]) {
.container_decl,
.container_decl_trailing,
.container_decl_arg,
.container_decl_arg_trailing,
.container_decl_two,
.container_decl_two_trailing,
=> {
if (!allDigits(name)) return null;
const index = std.fmt.parseUnsigned(u16, name, 10) catch return null;
return analyser.resolveTupleFieldType(ty, index);
},
else => {},
},
.container => {},

.other => |node_handle| switch (node_handle.handle.tree.nodes.items(.tag)[node_handle.node]) {
.multiline_string_literal,
Expand Down Expand Up @@ -1725,6 +1685,7 @@ fn resolveTypeOfNodeUncached(analyser: *Analyser, node_handle: NodeWithHandle) e
const elem_ty_slice = try analyser.arena.allocator().alloc(Type, array_init_info.ast.elements.len);
for (elem_ty_slice, array_init_info.ast.elements) |*elem_ty, element| {
elem_ty.* = try analyser.resolveTypeOfNodeInternal(.{ .node = element, .handle = handle }) orelse return null;
elem_ty.* = elem_ty.typeOf(analyser);
}
return .{
.data = .{ .tuple = elem_ty_slice },
Expand Down Expand Up @@ -1769,7 +1730,40 @@ fn resolveTypeOfNodeUncached(analyser: *Analyser, node_handle: NodeWithHandle) e
.tagged_union_two_trailing,
.tagged_union_enum_tag,
.tagged_union_enum_tag_trailing,
=> {
=> |tag| {
not_a_tuple: {
switch (tag) {
.container_decl,
.container_decl_trailing,
.container_decl_two,
.container_decl_two_trailing,
=> {},
else => break :not_a_tuple,
}

var buffer: [2]Ast.Node.Index = undefined;
const container_decl = tree.fullContainerDecl(&buffer, node).?;
if (container_decl.ast.members.len == 0) break :not_a_tuple; // technically a tuple
if (token_tags[container_decl.ast.main_token] != .keyword_struct) break :not_a_tuple;
const elem_ty_slice = try analyser.arena.allocator().alloc(Type, container_decl.ast.members.len);

var has_unresolved_fields = false;
for (elem_ty_slice, container_decl.ast.members) |*elem_ty, member_node| {
const container_field = tree.fullContainerField(member_node) orelse break :not_a_tuple;
if (!container_field.ast.tuple_like) break :not_a_tuple;
elem_ty.* = try analyser.resolveTypeOfNodeInternal(.{ .node = container_field.ast.type_expr, .handle = handle }) orelse {
has_unresolved_fields = true;
continue;
};
}

if (has_unresolved_fields) return null;
return .{
.data = .{ .tuple = elem_ty_slice },
.is_type_val = true,
};
}

// TODO: use map? idk
const document_scope = try handle.getDocumentScope();

Expand Down Expand Up @@ -2735,7 +2729,7 @@ pub const Type = struct {
}

pub fn isStructType(self: Type) bool {
return self.isContainerKind(.keyword_struct) or self.isRoot();
return self.data == .tuple or self.isContainerKind(.keyword_struct) or self.isRoot();
}

pub fn isNamespace(self: Type) bool {
Expand Down Expand Up @@ -2973,7 +2967,7 @@ pub const Type = struct {
if (i != 0) {
try writer.writeAll(", ");
}
try writer.print("{}", .{elem_ty.fmt(analyser, ctx.options)});
try writer.print("{}", .{elem_ty.fmtTypeVal(analyser, ctx.options)});
}
try writer.writeAll(" }");
},
Expand Down Expand Up @@ -4094,7 +4088,7 @@ pub const DeclWithHandle = struct {
}) orelse return null;
break :blk switch (node.data) {
.array => |array_info| try array_info.elem_ty.instanceTypeVal(analyser),
.container, .tuple => try analyser.resolveTupleFieldType(node, pay.index),
.tuple => try analyser.resolveTupleFieldType(node, pay.index),
else => null,
};
},
Expand Down
16 changes: 1 addition & 15 deletions src/features/completions.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ fn typeToCompletion(builder: *Builder, ty: Analyser.Type) error{OutOfMemory}!voi
.detail = try std.fmt.allocPrint(
builder.arena,
"{}",
.{elem_ty.fmt(builder.analyser, .{ .truncate_container_decls = false })},
.{elem_ty.fmtTypeVal(builder.analyser, .{ .truncate_container_decls = false })},
),
});
}
Expand All @@ -126,20 +126,6 @@ fn typeToCompletion(builder: *Builder, ty: Analyser.Type) error{OutOfMemory}!voi
.parent_container_ty = ty,
});
}

if (ty.is_type_val) return;
var i: usize = 0;
while (try builder.analyser.resolveTupleFieldType(ty, i)) |elem_ty| : (i += 1) {
try builder.completions.append(builder.arena, .{
.label = try std.fmt.allocPrint(builder.arena, "@\"{}\"", .{i}),
.kind = .Field,
.detail = try std.fmt.allocPrint(
builder.arena,
"{}",
.{elem_ty.fmt(builder.analyser, .{ .truncate_container_decls = false })},
),
});
}
},
.other => |node_handle| switch (node_handle.handle.tree.nodes.items(.tag)[node_handle.node]) {
.merge_error_sets => {
Expand Down
9 changes: 0 additions & 9 deletions tests/lsp_features/completion.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,6 @@ test "assign destructure" {
.{ .label = "foo", .kind = .Variable, .detail = "u32" },
.{ .label = "bar", .kind = .Constant, .detail = "u64" },
});
try testCompletion(
\\test {
\\ const S, const E = .{struct{}, enum{}};
\\ <cursor>
\\}
, &.{
.{ .label = "S", .kind = .Struct, .detail = "type" },
.{ .label = "E", .kind = .Enum, .detail = "type" },
});
try testCompletion(
\\test {
\\ var foo: u32 = undefined;
Expand Down
27 changes: 6 additions & 21 deletions tests/lsp_features/semantic_tokens.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,24 +202,6 @@ test "assign destructure" {
.{ "1", .number, .{} },
.{ "2", .number, .{} },
});
try testSemanticTokens(
\\test {
\\ const S, const E = .{ struct {}, enum {} };
\\};
, &.{
.{ "test", .keyword, .{} },

.{ "const", .keyword, .{} },
.{ "S", .namespace, .{ .declaration = true } },

.{ "const", .keyword, .{} },
.{ "E", .@"enum", .{ .declaration = true } },

.{ "=", .operator, .{} },

.{ "struct", .keyword, .{} },
.{ "enum", .keyword, .{} },
});
try testSemanticTokens(
\\test {
\\ var foo: u32 = undefined;
Expand Down Expand Up @@ -981,9 +963,9 @@ test "struct" {
try testSemanticTokens(
\\const T = u32;
\\const Foo = struct {
\\ u32,
\\ []const u8 align(8) = undefined,
\\ T align(4),
\\ alpha: u32,
\\ beta: []const u8 align(8) = undefined,
\\ gamma: T align(4),
\\};
, &.{
.{ "const", .keyword, .{} },
Expand All @@ -995,15 +977,18 @@ test "struct" {
.{ "=", .operator, .{} },
.{ "struct", .keyword, .{} },

.{ "alpha", .property, .{ .declaration = true } },
.{ "u32", .type, .{} },

.{ "beta", .property, .{ .declaration = true } },
.{ "const", .keyword, .{} },
.{ "u8", .type, .{} },
.{ "align", .keyword, .{} },
.{ "8", .number, .{} },
.{ "=", .operator, .{} },
.{ "undefined", .keywordLiteral, .{} },

.{ "gamma", .property, .{ .declaration = true } },
.{ "T", .type, .{} },
.{ "align", .keyword, .{} },
.{ "4", .number, .{} },
Expand Down

0 comments on commit 410877a

Please sign in to comment.