Merge pull request #650 from BradLewis/feat/hover-struct-definitions

Enrich hover information

1 files changed, 26 insertions, 3 deletions

diff --git a/src/server/hover.odin b/src/server/hover.odin
index cc3c5b2..b69385a 100644
--- a/src/server/hover.odin
+++ b/src/server/hover.odin
@@ -108,6 +108,28 @@ get_hover_information :: proc(document: ^Document, position: common.Position) ->
 		}
 	}
 
+	if position_context.struct_type != nil {
+		for field in position_context.struct_type.fields.list {
+			for name in field.names {
+				if position_in_node(name, position_context.position) {
+					if identifier, ok := name.derived.(^ast.Ident); ok && field.type != nil {
+						if position_context.value_decl != nil && len(position_context.value_decl.names) != 0 {
+							if symbol, ok := resolve_type_expression(&ast_context, field.type); ok {
+								if struct_symbol, ok := resolve_type_expression(&ast_context, position_context.value_decl.names[0]); ok {
+									symbol.pkg = struct_symbol.name
+									symbol.name = identifier.name
+									symbol.signature = get_signature(&ast_context, field.type.derived, symbol)
+									hover.contents = write_hover_content(&ast_context, symbol)
+									return hover, true, true
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
 	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 {
@@ -155,7 +177,7 @@ get_hover_information :: proc(document: ^Document, position: common.Position) ->
 
 			if position_in_node(base, position_context.position) {
 				if resolved, ok := resolve_type_identifier(&ast_context, ident); ok {
-					resolved.signature = get_signature(&ast_context, ident, resolved)
+					resolved.signature = get_signature(&ast_context, &ident, resolved)
 					resolved.name = ident.name
 
 					if resolved.type == .Variable {
@@ -206,7 +228,7 @@ get_hover_information :: proc(document: ^Document, position: common.Position) ->
 					if symbol, ok := resolve_type_expression(&ast_context, v.types[i]); ok {
 						symbol.name = name
 						symbol.pkg = selector.name
-						symbol.signature = common.node_to_string(v.types[i])
+						symbol.signature = get_signature(&ast_context, v.types[i].derived, symbol)
 						hover.contents = write_hover_content(&ast_context, symbol)
 						return hover, true, true
 					}
@@ -228,6 +250,7 @@ get_hover_information :: proc(document: ^Document, position: common.Position) ->
 			if position_context.field != nil {
 				if ident, ok := position_context.field.derived.(^ast.Ident); ok {
 					if symbol, ok := resolve_type_identifier(&ast_context, ident^); ok {
+						symbol.signature = get_signature(&ast_context, ident, symbol)
 						hover.contents = write_hover_content(&ast_context, symbol)
 						return hover, true, true
 					}
@@ -282,7 +305,7 @@ get_hover_information :: proc(document: ^Document, position: common.Position) ->
 		}
 
 		if resolved, ok := resolve_type_identifier(&ast_context, ident); ok {
-			resolved.signature = get_signature(&ast_context, ident, resolved)
+			resolved.signature = get_signature(&ast_context, &ident, resolved)
 			resolved.name = ident.name
 
 			if resolved.type == .Variable {