maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix the Open Source option in the debugger errors list

Browse source
This commit is contained in:
Julian Adamse 2021-11-06 19:16:13 +01:00
parent 4651b2ae5c
commit 408bb43fef
1 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
editor/debugger/script_editor_debugger.cpp
View file

@ -1413,7 +1413,26 @@ void ScriptEditorDebugger::_error_tree_item_rmb_selected(const Vector2 &p_pos) {
if (error_tree->is_anything_selected()) {
item_menu->add_icon_item(get_theme_icon(SNAME("ActionCopy"), SNAME("EditorIcons")), TTR("Copy Error"), ACTION_COPY_ERROR);
item_menu->add_icon_item(get_theme_icon(SNAME("Instance"), SNAME("EditorIcons")), TTR("Open C++ Source on GitHub"), ACTION_OPEN_SOURCE);
// Check if the "Open C++ Source on GitHub" option should be shown
bool source_present = false;
TreeItem *ti = error_tree->get_selected();
while (ti->get_parent() != error_tree->get_root()) {
ti = ti->get_parent();
}
// Start looking at the first child
TreeItem *ci = ti->get_first_child();
while (ci != nullptr) {
if (ci->get_text(0) == ("<" + TTR("C++ Source") + ">")) {
// Found the right field
source_present = true;
break;
}
ci = ci->get_next();
}
if (source_present) {
item_menu->add_icon_item(get_theme_icon(SNAME("Instance"), SNAME("EditorIcons")), TTR("Open C++ Source on GitHub"), ACTION_OPEN_SOURCE);
}
}
if (item_menu->get_item_count() > 0) {
@ -1457,8 +1476,17 @@ void ScriptEditorDebugger::_item_menu_id_pressed(int p_option) {
ti = ti->get_parent();
}
// We only need the first child here (C++ source stack trace).
// Start looking at the first child
TreeItem *ci = ti->get_first_child();
while (ci != nullptr) {
if (ci->get_text(0) == ("<" + TTR("C++ Source") + ">")) {
// Found the right field
break;
}
ci = ci->get_next();
}
ERR_FAIL_NULL_MSG(ci, "Error C++ source stack trace is missing (please report).");
// Parse back the `file:line @ method()` string.
const Vector<String> file_line_number = ci->get_text(1).split("@")[0].strip_edges().split(":");
ERR_FAIL_COND_MSG(file_line_number.size() < 2, "Incorrect C++ source stack trace file:line format (please report).");