From 2554c72bb219286825ee8d47a2c6c748416acb0e Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Mon, 24 Jan 2022 14:47:33 +0000
Subject: [PATCH] Update CommentGroup parsing for struct types

---
 src/check_type.cpp  | 10 ++++++++++
 src/docs_format.cpp |  4 ++--
 src/docs_writer.cpp |  6 ++++++
 src/entity.cpp      |  2 ++
 src/parser.cpp      |  2 +-
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/check_type.cpp b/src/check_type.cpp
index a5a757f3e..2a7479d68 100644
--- a/src/check_type.cpp
+++ b/src/check_type.cpp
@@ -120,6 +120,8 @@ void check_struct_fields(CheckerContext *ctx, Ast *node, Slice<Entity *> *fields
 		ast_node(p, Field, param);
 		Ast *type_expr = p->type;
 		Type *type = nullptr;
+		CommentGroup *docs = p->docs;
+		CommentGroup *comment = p->comment;
 
 		if (type_expr != nullptr) {
 			type = check_type_expr(ctx, type_expr, nullptr);
@@ -156,6 +158,14 @@ void check_struct_fields(CheckerContext *ctx, Ast *node, Slice<Entity *> *fields
 			Entity *field = alloc_entity_field(ctx->scope, name_token, type, is_using, field_src_index);
 			add_entity(ctx, ctx->scope, name, field);
 			field->Variable.field_group_index = field_group_index;
+
+			if (j == 0) {
+				field->Variable.docs = docs;
+			}
+			if (j+1 == p->names.count) {
+				field->Variable.comment = comment;
+			}
+
 			array_add(&fields_array, field);
 			String tag = p->tag.string;
 			if (tag.len != 0 && !unquote_string(permanent_allocator(), &tag, 0, tag.text[0] == '`')) {
diff --git a/src/docs_format.cpp b/src/docs_format.cpp
index f47fd0945..39f2e307c 100644
--- a/src/docs_format.cpp
+++ b/src/docs_format.cpp
@@ -185,8 +185,8 @@ struct OdinDocEntity {
 	OdinDocTypeIndex   type;
 	OdinDocString      init_string;
 	u32                reserved_for_init;
-	OdinDocString      comment;
-	OdinDocString      docs;
+	OdinDocString      comment; // line comment
+	OdinDocString      docs; // preceding comment
 	i32                field_group_index;
 	OdinDocEntityIndex foreign_library;
 	OdinDocString      link_name;
diff --git a/src/docs_writer.cpp b/src/docs_writer.cpp
index 0a990cc37..825ca113f 100644
--- a/src/docs_writer.cpp
+++ b/src/docs_writer.cpp
@@ -811,6 +811,12 @@ OdinDocEntityIndex odin_doc_add_entity(OdinDocWriter *w, Entity *e) {
 		comment = e->decl_info->comment;
 		docs = e->decl_info->docs;
 	}
+	if (!comment && e->kind == Entity_Variable) {
+		comment = e->Variable.comment;
+	}
+	if (!docs && e->kind == Entity_Variable) {
+		docs = e->Variable.docs;
+	}
 
 	String link_name = {};
 
diff --git a/src/entity.cpp b/src/entity.cpp
index 05ee9a33e..0f8bfa456 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -175,6 +175,8 @@ struct Entity {
 			String     link_name;
 			String     link_prefix;
 			String     link_section;
+			CommentGroup *docs;
+			CommentGroup *comment;
 			bool       is_foreign;
 			bool       is_export;
 		} Variable;
diff --git a/src/parser.cpp b/src/parser.cpp
index 7e7146244..076c698ff 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -944,7 +944,7 @@ Ast *ast_field(AstFile *f, Array<Ast *> const &names, Ast *type, Ast *default_va
 	result->Field.default_value = default_value;
 	result->Field.flags         = flags;
 	result->Field.tag           = tag;
-	result->Field.docs = docs;
+	result->Field.docs          = docs;
 	result->Field.comment       = comment;
 	return result;
 }