From 23f9be141bb0f7dc5eb35f395d5cf4011edac836 Mon Sep 17 00:00:00 2001 From: Brad Lewis <22850972+BradLewis@users.noreply.github.com> Date: Tue, 28 Oct 2025 05:29:44 -0400 Subject: Correctly resolve enum types that are array values --- src/server/analysis.odin | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/server/analysis.odin b/src/server/analysis.odin index 32d38eb..8cd75d6 100644 --- a/src/server/analysis.odin +++ b/src/server/analysis.odin @@ -2287,12 +2287,29 @@ resolve_implicit_selector_comp_literal :: proc( return resolve_type_expression(ast_context, type) case SymbolFixedArrayValue: - //This will be a comp_lit for an enumerated array - //EnumIndexedArray :: [TestEnum]u32 { - // .valueOne = 1, - // .valueTwo = 2, - //} - return resolve_type_expression(ast_context, v.len) + if position_in_node(v.len, position_context.position) { + return resolve_type_expression(ast_context, v.len) + } else if position_in_node(v.expr, position_context.position) { + return resolve_type_expression(ast_context, v.expr) + } + if _, _, ok := unwrap_enum(ast_context, v.len); ok { + for elem in comp_lit.elems { + if position_in_node(elem, position_context.position) { + if field, ok := elem.derived.(^ast.Field_Value); ok { + if position_in_node(field.field, position_context.position) { + return resolve_type_expression(ast_context, v.len) + } + return resolve_type_expression(ast_context, v.expr) + } + return resolve_type_expression(ast_context, v.len) + } + } + } + return resolve_type_expression(ast_context, v.expr) + case SymbolSliceValue: + return resolve_type_expression(ast_context, v.expr) + case SymbolDynamicArrayValue: + return resolve_type_expression(ast_context, v.expr) case SymbolMapValue: for elem in comp_lit.elems { if position_in_node(elem, position_context.position) { -- cgit v1.2.3