godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases 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

26
modules/gdscript/gdscript.cpp
View File

@@ -1111,21 +1111,27 @@ bool GDScript::inherits_script(const Ref<Script> &p_script) const {
GDScript *GDScript::find_class(const String &p_qualified_name) {
String first = p_qualified_name.get_slice("::", 0);
Vector<String> class_names;
GDScript *result = nullptr;
// Empty initial name means start here.
if (first.is_empty() || first == name) {
class_names = p_qualified_name.split("::");
result = this;
} else if (first == get_root_script()->path) {
} else if (p_qualified_name.begins_with(get_root_script()->path)) {
// Script path could have a class path separator("::") in it.
class_names = p_qualified_name.trim_prefix(get_root_script()->path).split("::");
result = get_root_script();
} else if (HashMap<StringName, Ref<GDScript>>::Iterator E = subclasses.find(first)) {
class_names = p_qualified_name.split("::");
result = E->value.ptr();
} else if (_owner != nullptr) {
// Check parent scope.
return _owner->find_class(p_qualified_name);
}
int name_count = p_qualified_name.get_slice_count("::");
for (int i = 1; result != nullptr && i < name_count; i++) {
String current_name = p_qualified_name.get_slice("::", i);
// Starts at index 1 because index 0 was handled above.
for (int i = 1; result != nullptr && i < class_names.size(); i++) {
String current_name = class_names[i];
if (HashMap<StringName, Ref<GDScript>>::Iterator E = result->subclasses.find(current_name)) {
result = E->value.ptr();
} else {
@@ -1137,11 +1143,12 @@ GDScript *GDScript::find_class(const String &p_qualified_name) {
return result;
}
bool GDScript::is_subclass(const GDScript *p_script) {
bool GDScript::has_class(const GDScript *p_script) {
String fqn = p_script->fully_qualified_name;
if (!fqn.is_empty() && fqn != fully_qualified_name && fqn.begins_with(fully_qualified_name)) {
String fqn_rest = fqn.substr(fully_qualified_name.length());
return find_class(fqn_rest) == p_script;
if (fully_qualified_name.is_empty() && fqn.get_slice("::", 0).is_empty()) {
return p_script == this;
} else if (fqn.begins_with(fully_qualified_name)) {
return p_script == find_class(fqn.trim_prefix(fully_qualified_name));
}
return false;
}
@@ -2597,8 +2604,7 @@ Ref<GDScript> GDScriptLanguage::get_script_by_fully_qualified_name(const String
SelfList<GDScript> *elem = script_list.first();
while (elem) {
GDScript *scr = elem->self();
scr = scr->find_class(p_name);
if (scr != nullptr) {
if (scr->fully_qualified_name == p_name) {
return scr;
}
elem = elem->next();