Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-26 11:14:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix script editor errors with CustomCallables

Browse source
This commit is contained in:
kobewi 2022-02-06 19:02:53 +01:00
parent 95719930a8
commit a08fc442a0
6 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
editor/plugins/script_text_editor.cpp
View file

@ -930,21 +930,22 @@ void ScriptTextEditor::_update_connected_methods() {
continue;
}
if (methods_found.has(connection.callable.get_method())) {
const StringName method = connection.callable.get_method();
if (methods_found.has(method)) {
continue;
}
if (!ClassDB::has_method(script->get_instance_base_type(), connection.callable.get_method())) {
if (!ClassDB::has_method(script->get_instance_base_type(), method)) {
int line = -1;
for (int j = 0; j < functions.size(); j++) {
String name = functions[j].get_slice(":", 0);
if (name == connection.callable.get_method()) {
if (name == method) {
line = functions[j].get_slice(":", 1).to_int() - 1;
text_edit->set_line_gutter_metadata(line, connection_gutter, connection.callable.get_method());
text_edit->set_line_gutter_metadata(line, connection_gutter, method);
text_edit->set_line_gutter_icon(line, connection_gutter, get_parent_control()->get_theme_icon(SNAME("Slot"), SNAME("EditorIcons")));
text_edit->set_line_gutter_clickable(line, connection_gutter, true);
methods_found.insert(connection.callable.get_method());
methods_found.insert(method);
break;
}
}
@ -957,7 +958,7 @@ void ScriptTextEditor::_update_connected_methods() {
bool found_inherited_function = false;
Ref<Script> inherited_script = script->get_base_script();
while (!inherited_script.is_null()) {
if (inherited_script->has_method(connection.callable.get_method())) {
if (inherited_script->has_method(method)) {
found_inherited_function = true;
break;
}