Merge branch 'BradLewis-fix/hover-inside-field-assignment'

4 files changed, 67 insertions, 21 deletions

diff --git a/src/common/ast.odin b/src/common/ast.odin
index 6031d9d..1d286a5 100644
--- a/src/common/ast.odin
+++ b/src/common/ast.odin
@@ -1115,8 +1115,11 @@ build_string_node :: proc(node: ^ast.Node, builder: ^strings.Builder, remove_poi
 	case ^Proc_Type:
 		strings.write_string(builder, "proc(")
 		build_string(n.params, builder, remove_pointers)
-		strings.write_string(builder, ") -> ")
-		build_string(n.results, builder, remove_pointers)
+		strings.write_string(builder, ")")
+		if n.results != nil {
+			strings.write_string(builder, " -> ")
+			build_string(n.results, builder, remove_pointers)
+		}
 	case ^Pointer_Type:
 		if !remove_pointers {
 			strings.write_string(builder, "^")
diff --git a/src/odin/printer/visit.odin b/src/odin/printer/visit.odin
index 4d1a3af..5640016 100644
--- a/src/odin/printer/visit.odin
+++ b/src/odin/printer/visit.odin
@@ -1575,7 +1575,21 @@ visit_expr :: proc(
 	case ^Struct_Type:
 		document = text_position(p, "struct", v.pos)
 
-		document = cons(document, visit_poly_params(p, v.poly_params))
+		if v.poly_params != nil {
+			document = cons(document, text("("))
+			document = cons(
+				document,
+				nest(
+					cons(
+						break_with(""),
+						visit_signature_list(p, v.poly_params, false, false, options),
+					),
+				),
+			)
+			document = cons(document, break_with(""), text(")"))
+		} else {
+			document = cons(document, empty())
+		}
 
 		if v.is_packed {
 			document = cons_with_nopl(document, text("#packed"))
@@ -1619,7 +1633,9 @@ visit_expr :: proc(
 				nest(
 					cons(
 						newline_position(p, 1, v.fields.open),
-						visit_struct_field_list(p, v.fields, {.Add_Comma, .Trailing, .Enforce_Newline}),
+						group(
+							visit_struct_field_list(p, v.fields, {.Add_Comma, .Trailing, .Enforce_Newline})
+						),
 					),
 				),
 			)
diff --git a/src/server/analysis.odin b/src/server/analysis.odin
index 7202fe2..668260b 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)
@@ -3728,9 +3727,10 @@ unwrap_super_enum :: proc(
 
 	for type in symbol_union.types {
 		symbol := resolve_type_expression(ast_context, type) or_return
-		value := symbol.value.(SymbolEnumValue) or_return
-		append(&names, ..value.names)
-		append(&ranges, ..value.ranges)
+		if value, ok := symbol.value.(SymbolEnumValue); ok {
+			append(&names, ..value.names)
+			append(&ranges, ..value.ranges)
+		}
 	}
 
 	ret_value.names = names[:]
diff --git a/src/server/hover.odin b/src/server/hover.odin
index 9e4e20c..d1e861a 100644
--- a/src/server/hover.odin
+++ b/src/server/hover.odin
@@ -111,15 +111,17 @@ get_hover_information :: proc(document: ^Document, position: common.Position) ->
 	if position_context.field_value != nil && position_context.comp_lit != nil {
 		if comp_symbol, ok := resolve_comp_literal(&ast_context, &position_context); ok {
 			if field, ok := position_context.field_value.field.derived.(^ast.Ident); ok {
-				if v, ok := comp_symbol.value.(SymbolStructValue); ok {
-					for name, i in v.names {
-						if name == field.name {
-							if symbol, ok := resolve_type_expression(&ast_context, v.types[i]); ok {
-								symbol.name = name
-								symbol.pkg = comp_symbol.name
-								symbol.signature = common.node_to_string(v.types[i])
-								hover.contents = write_hover_content(&ast_context, symbol)
-								return hover, true, true
+				if position_in_node(field, position_context.position) {
+					if v, ok := comp_symbol.value.(SymbolStructValue); ok {
+						for name, i in v.names {
+							if name == field.name {
+								if symbol, ok := resolve_type_expression(&ast_context, v.types[i]); ok {
+									symbol.name = name
+									symbol.pkg = comp_symbol.name
+									symbol.signature = common.node_to_string(v.types[i])
+									hover.contents = write_hover_content(&ast_context, symbol)
+									return hover, true, true
+								}
 							}
 						}
 					}
@@ -234,6 +236,31 @@ get_hover_information :: proc(document: ^Document, position: common.Position) ->
 				}
 			}
 		}
+	} else if position_context.implicit_selector_expr != nil {
+		implicit_selector := position_context.implicit_selector_expr
+		if symbol, ok := resolve_implicit_selector(&ast_context, &position_context, implicit_selector); ok {
+			#partial switch v in symbol.value {
+			case SymbolEnumValue:
+				for name, i in v.names {
+					if strings.compare(name, implicit_selector.field.name) == 0 {
+						symbol.signature = fmt.tprintf(".%s", name)
+						hover.contents = write_hover_content(&ast_context, symbol)
+						return hover, true, true
+					}
+				}
+			case SymbolUnionValue:
+				if enum_value, ok := unwrap_super_enum(&ast_context, v); ok {
+					for name, i in enum_value.names {
+						if strings.compare(name, implicit_selector.field.name) == 0 {
+							symbol.signature = fmt.tprintf(".%s", name)
+							hover.contents = write_hover_content(&ast_context, symbol)
+							return hover, true, true
+						}
+					}
+				}
+			}
+		}	
+		return {}, false, true
 	} else if position_context.identifier != nil {
 		reset_ast_context(&ast_context)