Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix single-object inspect command regression

Browse source
This commit is contained in:
yotam-frid 2025-08-28 02:39:33 +02:00
parent 89f32c6ead
commit b01b84e3a1
No known key found for this signature in database
GPG key ID: 9CA7D4AF47105534
5 changed files with 53 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
editor/debugger/debug_adapter/debug_adapter_protocol.cpp
View file

@ -1176,6 +1176,16 @@ void DebugAdapterProtocol::on_debug_data(const String &p_msg, const Array &p_dat
parse_object(remote_obj); parse_object(remote_obj);
} }
#ifndef DISABLE_DEPRECATED
} else if (p_msg == "scene:inspect_object") {
if (!p_data.is_empty()) {
// Legacy single object response format.
SceneDebuggerObject remote_obj;
remote_obj.deserialize(p_data);
parse_object(remote_obj);
}
#endif // DISABLE_DEPRECATED
} else if (p_msg == "evaluation_return") { } else if (p_msg == "evaluation_return") {
// An evaluation was requested from the debuggee; parse it. // An evaluation was requested from the debuggee; parse it.
DebuggerMarshalls::ScriptStackVariable remote_evaluation; DebuggerMarshalls::ScriptStackVariable remote_evaluation;

14
editor/debugger/script_editor_debugger.cpp
View file

@ -435,6 +435,17 @@ void ScriptEditorDebugger::_msg_scene_inspect_objects(uint64_t p_thread_id, cons
} }
} }
#ifndef DISABLE_DEPRECATED
void ScriptEditorDebugger::_msg_scene_inspect_object(uint64_t p_thread_id, const Array &p_data) {
ERR_FAIL_COND(p_data.is_empty());
// Legacy compatibility: convert single object response to new format.
// p_data is [id, className, properties] - wrap it as first element of array for new handler.
Array wrapped_data;
wrapped_data.push_back(p_data);
_msg_scene_inspect_objects(p_thread_id, wrapped_data);
}
#endif // DISABLE_DEPRECATED
void ScriptEditorDebugger::_msg_servers_memory_usage(uint64_t p_thread_id, const Array &p_data) { void ScriptEditorDebugger::_msg_servers_memory_usage(uint64_t p_thread_id, const Array &p_data) {
vmem_tree->clear(); vmem_tree->clear();
TreeItem *root = vmem_tree->create_item(); TreeItem *root = vmem_tree->create_item();
@ -952,6 +963,9 @@ void ScriptEditorDebugger::_init_parse_message_handlers() {
parse_message_handlers["scene:click_ctrl"] = &ScriptEditorDebugger::_msg_scene_click_ctrl; parse_message_handlers["scene:click_ctrl"] = &ScriptEditorDebugger::_msg_scene_click_ctrl;
parse_message_handlers["scene:scene_tree"] = &ScriptEditorDebugger::_msg_scene_scene_tree; parse_message_handlers["scene:scene_tree"] = &ScriptEditorDebugger::_msg_scene_scene_tree;
parse_message_handlers["scene:inspect_objects"] = &ScriptEditorDebugger::_msg_scene_inspect_objects; parse_message_handlers["scene:inspect_objects"] = &ScriptEditorDebugger::_msg_scene_inspect_objects;
#ifndef DISABLE_DEPRECATED
parse_message_handlers["scene:inspect_object"] = &ScriptEditorDebugger::_msg_scene_inspect_object;
#endif // DISABLE_DEPRECATED
parse_message_handlers["servers:memory_usage"] = &ScriptEditorDebugger::_msg_servers_memory_usage; parse_message_handlers["servers:memory_usage"] = &ScriptEditorDebugger::_msg_servers_memory_usage;
parse_message_handlers["servers:drawn"] = &ScriptEditorDebugger::_msg_servers_drawn; parse_message_handlers["servers:drawn"] = &ScriptEditorDebugger::_msg_servers_drawn;
parse_message_handlers["stack_dump"] = &ScriptEditorDebugger::_msg_stack_dump; parse_message_handlers["stack_dump"] = &ScriptEditorDebugger::_msg_stack_dump;

3
editor/debugger/script_editor_debugger.h
View file

@ -203,6 +203,9 @@ private:
void _msg_scene_click_ctrl(uint64_t p_thread_id, const Array &p_data); void _msg_scene_click_ctrl(uint64_t p_thread_id, const Array &p_data);
void _msg_scene_scene_tree(uint64_t p_thread_id, const Array &p_data); void _msg_scene_scene_tree(uint64_t p_thread_id, const Array &p_data);
void _msg_scene_inspect_objects(uint64_t p_thread_id, const Array &p_data); void _msg_scene_inspect_objects(uint64_t p_thread_id, const Array &p_data);
#ifndef DISABLE_DEPRECATED
void _msg_scene_inspect_object(uint64_t p_thread_id, const Array &p_data);
#endif // DISABLE_DEPRECATED
void _msg_servers_memory_usage(uint64_t p_thread_id, const Array &p_data); void _msg_servers_memory_usage(uint64_t p_thread_id, const Array &p_data);
void _msg_servers_drawn(uint64_t p_thread_id, const Array &p_data); void _msg_servers_drawn(uint64_t p_thread_id, const Array &p_data);
void _msg_stack_dump(uint64_t p_thread_id, const Array &p_data); void _msg_stack_dump(uint64_t p_thread_id, const Array &p_data);

23
scene/debugger/scene_debugger.cpp
View file

@ -167,6 +167,26 @@ Error SceneDebugger::_msg_inspect_objects(const Array &p_args) {
return OK; return OK;
} }
#ifndef DISABLE_DEPRECATED
Error SceneDebugger::_msg_inspect_object(const Array &p_args) {
ERR_FAIL_COND_V(p_args.is_empty(), ERR_INVALID_DATA);
// Legacy compatibility: convert single object ID to new format, then send single object response.
Vector<ObjectID> ids;
ids.append(ObjectID(p_args[0].operator uint64_t()));
SceneDebuggerObject obj(ids[0]);
if (obj.id.is_null()) {
EngineDebugger::get_singleton()->send_message("scene:inspect_object", Array());
return OK;
}
Array arr;
obj.serialize(arr);
EngineDebugger::get_singleton()->send_message("scene:inspect_object", arr);
return OK;
}
#endif // DISABLE_DEPRECATED
Error SceneDebugger::_msg_clear_selection(const Array &p_args) { Error SceneDebugger::_msg_clear_selection(const Array &p_args) {
RuntimeNodeSelect::get_singleton()->_clear_selection(); RuntimeNodeSelect::get_singleton()->_clear_selection();
return OK; return OK;
@ -496,6 +516,9 @@ void SceneDebugger::_init_message_handlers() {
message_handlers["request_scene_tree"] = _msg_request_scene_tree; message_handlers["request_scene_tree"] = _msg_request_scene_tree;
message_handlers["save_node"] = _msg_save_node; message_handlers["save_node"] = _msg_save_node;
message_handlers["inspect_objects"] = _msg_inspect_objects; message_handlers["inspect_objects"] = _msg_inspect_objects;
#ifndef DISABLE_DEPRECATED
message_handlers["inspect_object"] = _msg_inspect_object;
#endif // DISABLE_DEPRECATED
message_handlers["clear_selection"] = _msg_clear_selection; message_handlers["clear_selection"] = _msg_clear_selection;
message_handlers["suspend_changed"] = _msg_suspend_changed; message_handlers["suspend_changed"] = _msg_suspend_changed;
message_handlers["next_frame"] = _msg_next_frame; message_handlers["next_frame"] = _msg_next_frame;

3
scene/debugger/scene_debugger.h
View file

@ -83,6 +83,9 @@ private:
static Error _msg_request_scene_tree(const Array &p_args); static Error _msg_request_scene_tree(const Array &p_args);
static Error _msg_save_node(const Array &p_args); static Error _msg_save_node(const Array &p_args);
static Error _msg_inspect_objects(const Array &p_args); static Error _msg_inspect_objects(const Array &p_args);
#ifndef DISABLE_DEPRECATED
static Error _msg_inspect_object(const Array &p_args);
#endif // DISABLE_DEPRECATED
static Error _msg_clear_selection(const Array &p_args); static Error _msg_clear_selection(const Array &p_args);
static Error _msg_suspend_changed(const Array &p_args); static Error _msg_suspend_changed(const Array &p_args);
static Error _msg_next_frame(const Array &p_args); static Error _msg_next_frame(const Array &p_args);