summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-09-03 01:36:49 +0200
committerGitHub <noreply@github.com>2017-09-03 01:36:49 +0200
commit0989f06036169e92cbe3127eb5f0b328b9374819 (patch)
tree483a062babd432753d8beea1fc8ae32fe3d6bab1
parent0b747c29106e0e02f8c9b674cde418a7d270d987 (diff)
parent65509298306628bbbdd3caacb6a0ce5899fe147a (diff)
Merge pull request #10906 from neikeq/docdata-return-attrs-enum
DocData: Include enum attributes in return nodes
-rw-r--r--editor/doc/doc_data.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp
index 5975e54356..6848c43b68 100644
--- a/editor/doc/doc_data.cpp
+++ b/editor/doc/doc_data.cpp
@@ -634,6 +634,9 @@ static Error _parse_methods(Ref<XMLParser> &parser, Vector<DocData::MethodDoc> &
ERR_FAIL_COND_V(!parser->has_attribute("type"), ERR_FILE_CORRUPT);
method.return_type = parser->get_attribute_value("type");
+ if (parser->has_attribute("enum")) {
+ method.return_enum = parser->get_attribute_value("enum");
+ }
} else if (name == "argument") {
DocData::ArgumentDoc argument;
@@ -916,7 +919,11 @@ Error DocData::save(const String &p_path) {
if (m.return_type != "") {
- _write_string(f, 3, "<return type=\"" + m.return_type + "\">");
+ String enum_text;
+ if (m.return_enum != String()) {
+ enum_text = " enum=\"" + m.return_enum + "\"";
+ }
+ _write_string(f, 3, "<return type=\"" + m.return_type + "\"" + enum_text + ">");
_write_string(f, 3, "</return>");
}