Merge pull request #647 from BradLewis/master

Resolve assignments before switch statements position context

1 files changed, 4 insertions, 5 deletions

diff --git a/src/server/analysis.odin b/src/server/analysis.odin
index 7202fe2..7f0007e 100644
--- a/src/server/analysis.odin
+++ b/src/server/analysis.odin
@@ -1669,12 +1669,7 @@ resolve_implicit_selector :: proc(
 		}
 	}
 
-	if position_context.switch_stmt != nil {
-		return resolve_type_expression(ast_context, position_context.switch_stmt.cond)
-	}
-
 	if position_context.assign != nil && len(position_context.assign.lhs) == len(position_context.assign.rhs) {
-
 		for _, i in position_context.assign.lhs {
 			if position_in_node(position_context.assign.rhs[i], position_context.position) {
 				return resolve_type_expression(ast_context, position_context.assign.lhs[i])
@@ -1682,6 +1677,10 @@ resolve_implicit_selector :: proc(
 		}
 	}
 
+	if position_context.switch_stmt != nil {
+		return resolve_type_expression(ast_context, position_context.switch_stmt.cond)
+	}
+
 	if position_context.binary != nil {
 		if position_in_node(position_context.binary.left, position_context.position) {
 			return resolve_type_expression(ast_context, position_context.binary.right)