Correctly resolve implicit selector within a switch case

2 files changed, 43 insertions, 2 deletions

diff --git a/src/server/analysis.odin b/src/server/analysis.odin
index cde9c5d..b042c65 100644
--- a/src/server/analysis.odin
+++ b/src/server/analysis.odin
@@ -2180,8 +2180,23 @@ resolve_implicit_selector :: proc(
 	}
 
 	if position_context.switch_stmt != nil {
-		if symbol, ok := resolve_type_expression(ast_context, position_context.switch_stmt.cond); ok {
-			return symbol, ok
+		if position_in_node(position_context.switch_stmt.cond, position_context.position) {
+			if symbol, ok := resolve_type_expression(ast_context, position_context.switch_stmt.cond); ok {
+				return symbol, ok
+			}
+		}
+		if body, ok := position_context.switch_stmt.body.derived.(^ast.Block_Stmt); ok {
+			for stmt in body.stmts {
+				if cc, ok := stmt.derived.(^ast.Case_Clause); ok {
+					for item in cc.list {
+						if position_in_node(item, position_context.position) {
+							if symbol, ok := resolve_type_expression(ast_context, position_context.switch_stmt.cond); ok {
+								return symbol, ok
+							}
+						}
+					}
+				}
+			}
 		}
 	}
 
diff --git a/tests/hover_test.odin b/tests/hover_test.odin
index adddb89..4889df6 100644
--- a/tests/hover_test.odin
+++ b/tests/hover_test.odin
@@ -4417,6 +4417,32 @@ ast_hover_defer_statement :: proc(t: ^testing.T) {
 	}
 	test.expect_hover(t, &source, "test.s: struct {\n\tbar: int,\n}")
 }
+
+@(test)
+ast_hover_implicit_selector_return :: proc(t: ^testing.T) {
+	source := test.Source {
+		main = `package test
+
+		Foo :: enum {
+			A,
+			B,
+		}
+
+		Bar :: enum {
+			A,
+			B,
+		}
+
+		main :: proc(foo: Foo) -> Bar {
+			switch foo {
+			case .A:
+				return .A{*}
+			}
+		}
+		`
+	}
+	test.expect_hover(t, &source, "test.Bar: .A")
+}
 /*
 
 Waiting for odin fix