asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #85215 from HolonProduction/type-from-property-class-name

Browse source 
Handle global classes when resolving type from `PropertyInfo`
This commit is contained in:
Rémi Verschelde 2024-01-18 09:33:22 +01:00
commit b5dcb5f58a
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/gdscript/gdscript_analyzer.cpp
View file

@ -4908,8 +4908,19 @@ GDScriptParser::DataType GDScriptAnalyzer::type_from_property(const PropertyInfo
} }
result.builtin_type = p_property.type; result.builtin_type = p_property.type;
if (p_property.type == Variant::OBJECT) { if (p_property.type == Variant::OBJECT) {
result.kind = GDScriptParser::DataType::NATIVE; if (ScriptServer::is_global_class(p_property.class_name)) {
result.native_type = p_property.class_name == StringName() ? SNAME("Object") : p_property.class_name; result.kind = GDScriptParser::DataType::SCRIPT;
result.script_path = ScriptServer::get_global_class_path(p_property.class_name);
result.native_type = ScriptServer::get_global_class_native_base(p_property.class_name);
Ref<Script> scr = ResourceLoader::load(ScriptServer::get_global_class_path(p_property.class_name));
if (scr.is_valid()) {
result.script_type = scr;
}
} else {
result.kind = GDScriptParser::DataType::NATIVE;
result.native_type = p_property.class_name == StringName() ? "Object" : p_property.class_name;
}
} else { } else {
result.kind = GDScriptParser::DataType::BUILTIN; result.kind = GDScriptParser::DataType::BUILTIN;
result.builtin_type = p_property.type; result.builtin_type = p_property.type;

15
modules/gdscript/gdscript_editor.cpp
View file

@ -1432,8 +1432,19 @@ static GDScriptCompletionIdentifier _type_from_property(const PropertyInfo &p_pr
ci.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT; ci.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
ci.type.builtin_type = p_property.type; ci.type.builtin_type = p_property.type;
if (p_property.type == Variant::OBJECT) { if (p_property.type == Variant::OBJECT) {
ci.type.kind = GDScriptParser::DataType::NATIVE; if (ScriptServer::is_global_class(p_property.class_name)) {
ci.type.native_type = p_property.class_name == StringName() ? "Object" : p_property.class_name; ci.type.kind = GDScriptParser::DataType::SCRIPT;
ci.type.script_path = ScriptServer::get_global_class_path(p_property.class_name);
ci.type.native_type = ScriptServer::get_global_class_native_base(p_property.class_name);
Ref<Script> scr = ResourceLoader::load(ScriptServer::get_global_class_path(p_property.class_name));
if (scr.is_valid()) {
ci.type.script_type = scr;
}
} else {
ci.type.kind = GDScriptParser::DataType::NATIVE;
ci.type.native_type = p_property.class_name == StringName() ? "Object" : p_property.class_name;
}
} else { } else {
ci.type.kind = GDScriptParser::DataType::BUILTIN; ci.type.kind = GDScriptParser::DataType::BUILTIN;
} }