Skip to content

Commit

Permalink
Merge pull request #60737 from kleonc/debug-inspect-nested-dict-array…
Browse files Browse the repository at this point in the history
…-fix-3x

[3.x] Fix inspecting nested dictionaries/arrays when debugging
  • Loading branch information
akien-mga authored May 4, 2022
2 parents 37fd526 + 2e4e8bb commit 40cec55
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions editor/script_editor_debugger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,8 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
new_props_added++;
debugObj->prop_values[pinfo.name] = var;
} else {
if (bool(Variant::evaluate(Variant::OP_NOT_EQUAL, debugObj->prop_values[pinfo.name], var))) {
// Compare using `deep_equal` so dictionaries/arrays will be compared by value.
if (!debugObj->prop_values[pinfo.name].deep_equal(var)) {
debugObj->prop_values[pinfo.name] = var;
changed.insert(pinfo.name);
}
Expand Down Expand Up @@ -715,7 +716,6 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da

vmem_total->set_tooltip(TTR("Bytes:") + " " + itos(total));
vmem_total->set_text(String::humanize_size(total));

} else if (p_msg == "stack_dump") {
stack_dump->clear();
TreeItem *r = stack_dump->create_item();
Expand Down Expand Up @@ -801,7 +801,6 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da

variables->update();
inspector->edit(variables);

} else if (p_msg == "output") {
//OUT
for (int i = 0; i < p_data.size(); i++) {
Expand Down Expand Up @@ -837,7 +836,6 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da

EditorNode::get_log()->add_message(str, msg_type);
}

} else if (p_msg == "performance") {
Array arr = p_data[0];
Vector<float> p;
Expand Down Expand Up @@ -871,7 +869,6 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
}
perf_history.push_front(p);
perf_draw->update();

} else if (p_msg == "error") {
// Should have at least two elements, error array and stack items count.
ERR_FAIL_COND_MSG(p_data.size() < 2, "Malformed error message from script debugger.");
Expand Down Expand Up @@ -999,11 +996,9 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
} else {
error_count++;
}

} else if (p_msg == "profile_sig") {
//cache a signature
profiler_signature[p_data[1]] = p_data[0];

} else if (p_msg == "profile_frame" || p_msg == "profile_total") {
EditorProfiler::Metric metric;
metric.valid = true;
Expand Down

0 comments on commit 40cec55

Please sign in to comment.