diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2021-08-03 17:12:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-03 17:12:37 +0200 |
| commit | 80fc90e82a57e8111cb7577b05bb2de021000e75 (patch) | |
| tree | defa5d920819e120f6012eb91865bee770018e0f /core/debugger | |
| parent | db9c9932508026a570b7beb4d5ddfb35aa5f1c42 (diff) | |
| parent | 7bccd5487e83d66351c8b8cd17ab1b6ce719df09 (diff) | |
Merge pull request #50454 from Ev1lbl0w/gsoc21-dap
Implemented initial DAP support
Diffstat (limited to 'core/debugger')
| -rw-r--r-- | core/debugger/remote_debugger.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/debugger/remote_debugger.cpp b/core/debugger/remote_debugger.cpp index 0add12ff3d..62d5126e57 100644 --- a/core/debugger/remote_debugger.cpp +++ b/core/debugger/remote_debugger.cpp @@ -706,6 +706,8 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) { Array msg; msg.push_back(p_can_continue); msg.push_back(error_str); + ERR_FAIL_COND(!script_lang); + msg.push_back(script_lang->debug_get_stack_level_count() > 0); send_message("debug_enter", msg); servers_profiler->skip_profile_frame = true; // Avoid frame time spike in debug. @@ -754,7 +756,6 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) { break; } else if (command == "get_stack_dump") { - ERR_FAIL_COND(!script_lang); DebuggerMarshalls::ScriptStackDump dump; int slc = script_lang->debug_get_stack_level_count(); for (int i = 0; i < slc; i++) { @@ -790,7 +791,9 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) { script_lang->debug_get_globals(&globals, &globals_vals); ERR_FAIL_COND(globals.size() != globals_vals.size()); - send_message("stack_frame_vars", Array()); + Array var_size; + var_size.push_back(local_vals.size() + member_vals.size() + globals_vals.size()); + send_message("stack_frame_vars", var_size); _send_stack_vars(locals, local_vals, 0); _send_stack_vars(members, member_vals, 1); _send_stack_vars(globals, globals_vals, 2); |