Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-03 07:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

GDScript: Fix built-in script and other find_class bugs

Browse source
This commit is contained in:
rune-scape 2022-12-12 07:35:55 -05:00
parent 47ef0549ee
commit e1c63fee86
4 changed files with 34 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

40
modules/gdscript/gdscript_analyzer.cpp
View file

@ -3993,37 +3993,27 @@ GDScriptParser::DataType GDScriptAnalyzer::type_from_variant(const Variant &p_va
result.kind = GDScriptParser::DataType::CLASS;
// This might be an inner class, so we want to get the parser for the root.
// But still get the inner class from that tree.
GDScript *current = gds.ptr();
List<StringName> class_chain;
while (current->_owner) {
// Push to front so it's in reverse.
class_chain.push_front(current->name);
current = current->_owner;
}
Ref<GDScriptParserRef> ref = get_parser_for(current->get_path());
String script_path = gds->get_script_path();
Ref<GDScriptParserRef> ref = get_parser_for(script_path);
if (ref.is_null()) {
push_error("Could not find script in path.", p_source);
push_error(vformat(R"(Could not find script "%s".)", script_path), p_source);
GDScriptParser::DataType error_type;
error_type.kind = GDScriptParser::DataType::VARIANT;
return error_type;
}
ref->raise_status(GDScriptParserRef::INHERITANCE_SOLVED);
GDScriptParser::ClassNode *found = ref->get_parser()->head;
for (const StringName &E : class_chain) {
if (!found->has_member(E)) {
return GDScriptParser::DataType();
Error err = ref->raise_status(GDScriptParserRef::INHERITANCE_SOLVED);
GDScriptParser::ClassNode *found = nullptr;
if (err == OK) {
found = ref->get_parser()->find_class(gds->fully_qualified_name);
if (found != nullptr) {
err = resolve_class_inheritance(found, p_source);
}
if (found->get_member(E).type != GDScriptParser::ClassNode::Member::CLASS) {
return GDScriptParser::DataType();
}
resolve_class_member(found, E, p_source);
found = found->get_member(E).m_class;
}
if (err || found == nullptr) {
push_error(vformat(R"(Could not resolve script "%s".)", script_path), p_source);
GDScriptParser::DataType error_type;
error_type.kind = GDScriptParser::DataType::VARIANT;
return error_type;
}
result = found->get_datatype();