Resolve type of enum values

zigtools · Jul 10, 2023 · 8179303 · 8179303
1 parent e14c48f
commit 8179303
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/analysis.zig b/src/analysis.zig
@@ -952,6 +952,11 @@ fn resolveTypeOfNodeUncached(analyser: *Analyser, node_handle: NodeWithHandle) e
         .@"try",
         .address_of,
         => {
+            if (node_tags[node].isContainerField()) {
+                const container_type = innermostContainer(handle, offsets.tokenToIndex(tree, tree.firstToken(node)));
+                if (container_type.isEnumType())
+                    return container_type.instanceTypeVal();
+            }
             const base = .{ .node = datas[node].lhs, .handle = handle };
             const base_type = (try analyser.resolveTypeOfNodeInternal(base)) orelse
                 return null;

diff --git a/src/features/hover.zig b/src/features/hover.zig
@@ -55,11 +55,14 @@ pub fn hoverSymbol(server: *Server, decl_handle: Analyser.DeclWithHandle, markup
             } else if (tree.fullFnProto(&buf, node)) |fn_proto| {
                 break :def Analyser.getFunctionSignature(tree, fn_proto);
             } else if (tree.fullContainerField(node)) |field| {
-                std.debug.assert(field.ast.type_expr != 0);
-                try server.analyser.referencedTypesFromNode(
-                    .{ .node = field.ast.type_expr, .handle = handle },
-                    &reference_collector,
-                );
+                var converted = field;
+                converted.convertToNonTupleLike(tree.nodes);
+
+                if (converted.ast.type_expr != 0)
+                    try server.analyser.referencedTypesFromNode(
+                        .{ .node = converted.ast.type_expr, .handle = handle },
+                        &reference_collector,
+                    );
 
                 break :def Analyser.getContainerFieldSignature(tree, field);
             } else {