Merge pull request #994 from BradLewis/chore/resolve-assign-comp-lits

Improvements to resolving assignment comp lits

1 files changed, 33 insertions, 0 deletions

diff --git a/src/server/analysis.odin b/src/server/analysis.odin
index d5ba9d1..4f70fbd 100644
--- a/src/server/analysis.odin
+++ b/src/server/analysis.odin
@@ -1995,6 +1995,39 @@ internal_resolve_comp_literal :: proc(
 				position_context.function.type.results.list[return_index].type,
 			) or_return
 		}
+	} else if position_context.assign != nil {
+		if len(position_context.assign.lhs) > 0 {
+			if position_in_exprs(position_context.assign.lhs, position_context.position) {
+				for n in position_context.assign.lhs {
+					if position_in_node(n, position_context.position) {
+						// check if we're a comp literal of a map key
+						if index_expr, ok := n.derived.(^ast.Index_Expr); ok {
+							if s, ok := resolve_proc(ast_context, index_expr.expr); ok {
+								if value, ok := s.value.(SymbolMapValue); ok {
+									symbol = resolve_proc(ast_context, value.key) or_return
+								}
+							}
+						} else {
+							symbol = resolve_proc(ast_context, n) or_return
+						}
+						break
+					}
+				}
+			} else {
+				index := 0
+				for value, i in position_context.assign.rhs {
+					if position_in_node(value, position_context.position) {
+						index = i
+						break
+					}
+				}
+				// Just to be safe
+				if index >= len(position_context.assign.lhs) {
+					index = 0
+				}
+				symbol = resolve_proc(ast_context, position_context.assign.lhs[index]) or_return
+			}
+		}
 	} else if position_context.value_decl != nil && position_context.value_decl.type != nil {
 		symbol = resolve_proc(ast_context, position_context.value_decl.type) or_return
 	}