From d48636c3bf96bb97f01e3a5ad69365776d030b7c Mon Sep 17 00:00:00 2001 From: "ocean (they/them)" Date: Sun, 2 Jul 2023 10:55:47 -0400 Subject: [PATCH] Fix regression with enum descriptions now showing up in documentation. --- editor/editor_help.cpp | 2 +- modules/gdscript/editor/gdscript_docgen.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 61e94388bab..5a3841e4ca7 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -1367,7 +1367,7 @@ void EditorHelp::_update_doc() { class_desc->add_newline(); // Enum description. - if (e != "@unnamed_enums" && cd.enums.has(e)) { + if (e != "@unnamed_enums" && cd.enums.has(e) && !cd.enums[e].strip_edges().is_empty()) { class_desc->push_color(theme_cache.text_color); _push_normal_font(); class_desc->push_indent(1); diff --git a/modules/gdscript/editor/gdscript_docgen.cpp b/modules/gdscript/editor/gdscript_docgen.cpp index df17581ad14..0d8453738d7 100644 --- a/modules/gdscript/editor/gdscript_docgen.cpp +++ b/modules/gdscript/editor/gdscript_docgen.cpp @@ -236,6 +236,8 @@ void GDScriptDocGen::generate_docs(GDScript *p_script, const GDP::ClassNode *p_c p_script->member_lines[name] = m_enum->start_line; + doc.enums[name] = m_enum->doc_description; + for (const GDP::EnumNode::Value &val : m_enum->values) { DocData::ConstantDoc const_doc; const_doc.name = val.identifier->name; @@ -244,7 +246,6 @@ void GDScriptDocGen::generate_docs(GDScript *p_script, const GDP::ClassNode *p_c const_doc.description = val.doc_description; const_doc.enumeration = name; - doc.enums[const_doc.name] = const_doc.description; doc.constants.push_back(const_doc); }