From 41c5c76526aad8ca69525abfed045d501171fe24 Mon Sep 17 00:00:00 2001
From: Brad Lewis <22850972+BradLewis@users.noreply.github.com>
Date: Sat, 7 Jun 2025 19:31:20 -0400
Subject: Add hover for struct fields within definition

---
 src/server/completion.odin | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/server/completion.odin')

diff --git a/src/server/completion.odin b/src/server/completion.odin
index 8d61e3e..54bff1f 100644
--- a/src/server/completion.odin
+++ b/src/server/completion.odin
@@ -1289,7 +1289,7 @@ get_identifier_completion :: proc(
 		ident.name = k
 
 		if symbol, ok := resolve_type_identifier(ast_context, ident^); ok {
-			symbol.signature = get_signature(ast_context, ident^, symbol)
+			symbol.signature = get_signature(ast_context, ident, symbol)
 
 			build_procedure_symbol_signature(&symbol)
 
@@ -1330,7 +1330,7 @@ get_identifier_completion :: proc(
 			ident.name = k
 
 			if symbol, ok := resolve_type_identifier(ast_context, ident^); ok {
-				symbol.signature = get_signature(ast_context, ident^, symbol)
+				symbol.signature = get_signature(ast_context, ident, symbol)
 
 				build_procedure_symbol_signature(&symbol)
 
-- 
cgit v1.2.3


From cea7502466e9a413d1b8980b6447c9316f03a93a Mon Sep 17 00:00:00 2001
From: Brad Lewis <22850972+BradLewis@users.noreply.github.com>
Date: Sat, 7 Jun 2025 20:52:55 -0400
Subject: Add short signature parameter and update completion tests

---
 src/server/analysis.odin    | 45 ++++++++++++++++++++++++++++++++++++++++-----
 src/server/completion.odin  |  4 ++--
 tests/completions_test.odin | 12 ++++++------
 tests/hover_test.odin       |  4 ++--
 4 files changed, 50 insertions(+), 15 deletions(-)

(limited to 'src/server/completion.odin')

diff --git a/src/server/analysis.odin b/src/server/analysis.odin
index dc3a380..e67b31e 100644
--- a/src/server/analysis.odin
+++ b/src/server/analysis.odin
@@ -3765,7 +3765,12 @@ unwrap_bitset :: proc(ast_context: ^AstContext, bitset_symbol: Symbol) -> (Symbo
 	return {}, false
 }
 
-append_variable_full_name :: proc(sb: ^strings.Builder,ast_context: ^AstContext, symbol: Symbol, pointer_prefix: string) {
+append_variable_full_name :: proc(
+	sb: ^strings.Builder,
+	ast_context: ^AstContext,
+	symbol: Symbol,
+	pointer_prefix: string,
+) {
 	pkg_name := get_symbol_pkg_name(ast_context, symbol)
 	if pkg_name == "" {
 		fmt.sbprintf(sb, "%s%s :: ", pointer_prefix, symbol.name)
@@ -3775,7 +3780,13 @@ append_variable_full_name :: proc(sb: ^strings.Builder,ast_context: ^AstContext,
 	return
 }
 
-get_signature :: proc(ast_context: ^AstContext, ident: ast.Any_Node, symbol: Symbol, was_variable := false) -> string {
+get_signature :: proc(
+	ast_context: ^AstContext,
+	ident: ast.Any_Node,
+	symbol: Symbol,
+	was_variable := false,
+	short_signature := false,
+) -> string {
 	if symbol.type == .Function {
 		return symbol.signature
 	}
@@ -3799,12 +3810,20 @@ get_signature :: proc(ast_context: ^AstContext, ident: ast.Any_Node, symbol: Sym
 			allocator = ast_context.allocator,
 		)
 	case SymbolEnumValue:
+		if short_signature {
+			builder := strings.builder_make(ast_context.allocator)
+			if is_variable {
+				append_variable_full_name(&builder, ast_context, symbol, pointer_prefix)
+			}
+			strings.write_string(&builder, "enum")
+			return strings.to_string(builder)
+		}
 		builder := strings.builder_make(ast_context.allocator)
 		if is_variable {
 			append_variable_full_name(&builder, ast_context, symbol, pointer_prefix)
 		}
 		strings.write_string(&builder, "enum {\n")
-		for i in 0..<len(v.names) {
+		for i in 0 ..< len(v.names) {
 			strings.write_string(&builder, "\t")
 			strings.write_string(&builder, v.names[i])
 			strings.write_string(&builder, ",\n")
@@ -3819,6 +3838,14 @@ get_signature :: proc(ast_context: ^AstContext, ident: ast.Any_Node, symbol: Sym
 	case SymbolProcedureValue:
 		return "proc"
 	case SymbolStructValue:
+		if short_signature {
+			builder := strings.builder_make(ast_context.allocator)
+			if is_variable {
+				append_variable_full_name(&builder, ast_context, symbol, pointer_prefix)
+			}
+			strings.write_string(&builder, "struct")
+			return strings.to_string(builder)
+		}
 		builder := strings.builder_make(ast_context.allocator)
 		if is_variable {
 			append_variable_full_name(&builder, ast_context, symbol, pointer_prefix)
@@ -3830,7 +3857,7 @@ get_signature :: proc(ast_context: ^AstContext, ident: ast.Any_Node, symbol: Sym
 			}
 		}
 		strings.write_string(&builder, "struct {\n")
-		for i in 0..<len(v.names) {
+		for i in 0 ..< len(v.names) {
 			strings.write_string(&builder, "\t")
 			strings.write_string(&builder, v.names[i])
 			fmt.sbprintf(&builder, ":%*s", longestNameLen - len(v.names[i]) + 1, "")
@@ -3840,12 +3867,20 @@ get_signature :: proc(ast_context: ^AstContext, ident: ast.Any_Node, symbol: Sym
 		strings.write_string(&builder, "}")
 		return strings.to_string(builder)
 	case SymbolUnionValue:
+		if short_signature {
+			builder := strings.builder_make(ast_context.allocator)
+			if is_variable {
+				append_variable_full_name(&builder, ast_context, symbol, pointer_prefix)
+			}
+			strings.write_string(&builder, "union")
+			return strings.to_string(builder)
+		}
 		builder := strings.builder_make(ast_context.allocator)
 		if is_variable {
 			append_variable_full_name(&builder, ast_context, symbol, pointer_prefix)
 		}
 		strings.write_string(&builder, "union {\n")
-		for i in 0..<len(v.types) {
+		for i in 0 ..< len(v.types) {
 			strings.write_string(&builder, "\t")
 			common.build_string_node(v.types[i], &builder, false)
 			strings.write_string(&builder, ",\n")
diff --git a/src/server/completion.odin b/src/server/completion.odin
index 54bff1f..57d289d 100644
--- a/src/server/completion.odin
+++ b/src/server/completion.odin
@@ -1289,7 +1289,7 @@ get_identifier_completion :: proc(
 		ident.name = k
 
 		if symbol, ok := resolve_type_identifier(ast_context, ident^); ok {
-			symbol.signature = get_signature(ast_context, ident, symbol)
+			symbol.signature = get_signature(ast_context, ident, symbol, short_signature=true)
 
 			build_procedure_symbol_signature(&symbol)
 
@@ -1330,7 +1330,7 @@ get_identifier_completion :: proc(
 			ident.name = k
 
 			if symbol, ok := resolve_type_identifier(ast_context, ident^); ok {
-				symbol.signature = get_signature(ast_context, ident, symbol)
+				symbol.signature = get_signature(ast_context, ident, symbol, short_signature=true)
 
 				build_procedure_symbol_signature(&symbol)
 
diff --git a/tests/completions_test.odin b/tests/completions_test.odin
index e5e0001..5e8c5d8 100644
--- a/tests/completions_test.odin
+++ b/tests/completions_test.odin
@@ -651,7 +651,7 @@ ast_for_in_identifier_completion :: proc(t: ^testing.T) {
 	}
 
 
-	test.expect_completion_details(t, &source, "", {"test.my_element: My_Struct"})
+	test.expect_completion_details(t, &source, "", {"test.my_element: test.My_Struct :: struct"})
 }
 
 @(test)
@@ -675,7 +675,7 @@ ast_for_in_call_expr_completion :: proc(t: ^testing.T) {
 	}
 
 
-	test.expect_completion_details(t, &source, ".", {"test.zstep: Step"})
+	test.expect_completion_details(t, &source, ".", {"test.zstep: test.Step :: struct"})
 }
 
 
@@ -1661,7 +1661,7 @@ ast_new_clone_completion :: proc(t: ^testing.T) {
 		`,
 	}
 
-	test.expect_completion_details(t, &source, "", {"test.adzz: ^Foo"})
+	test.expect_completion_details(t, &source, "", {"test.adzz: ^test.Foo :: struct"})
 }
 
 @(test)
@@ -1735,7 +1735,7 @@ ast_index_proc_parameter_completion :: proc(t: ^testing.T) {
 		packages = packages[:],
 	}
 
-	test.expect_completion_details(t, &source, ".", {"my_package.param: My_Struct"})
+	test.expect_completion_details(t, &source, ".", {"my_package.param: my_package.My_Struct :: struct"})
 }
 
 @(test)
@@ -2534,7 +2534,7 @@ ast_poly_struct_with_poly :: proc(t: ^testing.T) {
 		`,
 	}
 
-	test.expect_completion_details(t, &source, "", {"test.first: ^Animal"})
+	test.expect_completion_details(t, &source, "", {"test.first: ^test.Animal :: struct"})
 }
 
 @(test)
@@ -3013,7 +3013,7 @@ ast_enumerated_array_range_completion :: proc(t: ^testing.T) {
 		`,
 	}
 
-	test.expect_completion_details(t, &source, "", {"test.indezx: Enum"})
+	test.expect_completion_details(t, &source, "", {"test.indezx: test.Enum :: enum"})
 }
 
 @(test)
diff --git a/tests/hover_test.odin b/tests/hover_test.odin
index 3f941b1..fb64285 100644
--- a/tests/hover_test.odin
+++ b/tests/hover_test.odin
@@ -332,7 +332,7 @@ ast_hover_struct_field_selector_completion :: proc(t: ^testing.T) {
 		packages = packages[:],
 	}
 
-	test.expect_hover(t, &source, "my_package.My_Struct: struct")
+	test.expect_hover(t, &source, "my_package.My_Struct: struct {\n\tone:   int,\n\ttwo:   int,\n\tthree: int,\n}")
 }
 
 @(test)
@@ -485,7 +485,7 @@ ast_hover_proc_param_with_struct_from_another_package :: proc(t: ^testing.T) {
 		packages = packages[:],
 	}
 
-	test.expect_hover(t, &source, "test.cool: My_Struct :: struct {\n\tone:   int,\n\ttwo:   int,\n\tthree: int\n}")
+	test.expect_hover(t, &source, "my_package.My_Struct: struct {\n\tone:   int,\n\ttwo:   int,\n\tthree: int,\n}")
 }
 
 @(test)
-- 
cgit v1.2.3