Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support generic types in the extension API dump #64469

Closed
wants to merge 1 commit into from
Closed

Support generic types in the extension API dump #64469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 40 additions & 11 deletions core/extension/extension_api_dump.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "core/io/file_access.h"
#include "core/io/json.h"
#include "core/templates/pair.h"
#include "core/variant/typed_array.h"
#include "core/version.h"

#ifdef TOOLS_ENABLED
Expand Down Expand Up @@ -67,6 +68,18 @@ static String get_type_name(const PropertyInfo &p_info) {
return Variant::get_type_name(p_info.type);
}

static TypedArray<Dictionary> get_generic_type_args(const PropertyInfo &p_info) {
TypedArray<Dictionary> type_args;
if (p_info.type == Variant::ARRAY && p_info.hint == PROPERTY_HINT_ARRAY_TYPE) {
// The format of p_hint_string is:
// subType/subTypeHint:nextSubtype ... etc
Dictionary d;
d["type"] = p_info.hint_string.get_slice(":", 1);
type_args.append(d);
}
return type_args;
}

Dictionary NativeExtensionAPIDump::generate_extension_api() {
Dictionary api_dump;

Expand Down Expand Up @@ -731,6 +744,10 @@ Dictionary NativeExtensionAPIDump::generate_extension_api() {
}

d3["type"] = get_type_name(pinfo);
TypedArray<Dictionary> type_args = get_generic_type_args(pinfo);
if (!type_args.is_empty()) {
d3["generic_type_args"] = type_args;
}

if (i == -1) {
d2["return_value"] = d3;
Expand Down Expand Up @@ -774,6 +791,10 @@ Dictionary NativeExtensionAPIDump::generate_extension_api() {
d3["name"] = pinfo.name;
}
d3["type"] = get_type_name(pinfo);
TypedArray<Dictionary> type_args = get_generic_type_args(pinfo);
if (!type_args.is_empty()) {
d3["generic_type_args"] = type_args;
}

if (method->get_argument_meta(i) > 0) {
static const char *argmeta[11] = { "none", "int8", "int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64", "float", "double" };
Expand Down Expand Up @@ -817,10 +838,14 @@ Dictionary NativeExtensionAPIDump::generate_extension_api() {

Array arguments;

for (int i = 0; i < F.arguments.size(); i++) {
for (const PropertyInfo &pinfo : F.arguments) {
Dictionary d3;
d3["name"] = F.arguments[i].name;
d3["type"] = get_type_name(F.arguments[i]);
d3["name"] = pinfo.name;
d3["type"] = get_type_name(pinfo);
TypedArray<Dictionary> type_args = get_generic_type_args(pinfo);
if (!type_args.is_empty()) {
d3["generic_type_args"] = type_args;
}
arguments.push_back(d3);
}
if (arguments.size()) {
Expand All @@ -839,20 +864,24 @@ Dictionary NativeExtensionAPIDump::generate_extension_api() {
Array properties;
List<PropertyInfo> property_list;
ClassDB::get_property_list(class_name, &property_list, true);
for (const PropertyInfo &F : property_list) {
if (F.usage & PROPERTY_USAGE_CATEGORY || F.usage & PROPERTY_USAGE_GROUP || F.usage & PROPERTY_USAGE_SUBGROUP) {
for (const PropertyInfo &pinfo : property_list) {
if (pinfo.usage & PROPERTY_USAGE_CATEGORY || pinfo.usage & PROPERTY_USAGE_GROUP || pinfo.usage & PROPERTY_USAGE_SUBGROUP) {
continue; //not real properties
}
if (F.name.begins_with("_")) {
if (pinfo.name.begins_with("_")) {
continue; //hidden property
}
StringName property_name = F.name;
StringName property_name = pinfo.name;
Dictionary d2;
d2["type"] = get_type_name(F);
d2["type"] = get_type_name(pinfo);
TypedArray<Dictionary> type_args = get_generic_type_args(pinfo);
if (!type_args.is_empty()) {
d2["generic_type_args"] = type_args;
}
d2["name"] = String(property_name);
d2["setter"] = ClassDB::get_property_setter(class_name, F.name);
d2["getter"] = ClassDB::get_property_getter(class_name, F.name);
d2["index"] = ClassDB::get_property_index(class_name, F.name);
d2["setter"] = ClassDB::get_property_setter(class_name, pinfo.name);
d2["getter"] = ClassDB::get_property_getter(class_name, pinfo.name);
d2["index"] = ClassDB::get_property_index(class_name, pinfo.name);
properties.push_back(d2);
}

Expand Down