From cebdfd1bbd060bd77a9875ebfa5f8cebb6e2d7c0 Mon Sep 17 00:00:00 2001 From: Voylin <0voylin0@gmail.com> Date: Fri, 1 Jul 2022 04:33:59 +0900 Subject: [PATCH] Fixing Print_rich which only displays correctly in terminal There was an issue that the type was not passed through correctly. These couple of lines fix this issue and make print_rich work as expected. --- core/debugger/remote_debugger.cpp | 8 ++++++++ editor/debugger/script_editor_debugger.cpp | 3 +++ 2 files changed, 11 insertions(+) diff --git a/core/debugger/remote_debugger.cpp b/core/debugger/remote_debugger.cpp index 508a71ece9f..c73e2eb3fb3 100644 --- a/core/debugger/remote_debugger.cpp +++ b/core/debugger/remote_debugger.cpp @@ -297,6 +297,14 @@ void RemoteDebugger::flush_output() { } strings.push_back(output_string.message); types.push_back(MESSAGE_TYPE_ERROR); + } else if (output_string.type == MESSAGE_TYPE_LOG_RICH) { + if (!joined_log_strings.is_empty()) { + strings.push_back(String("\n").join(joined_log_strings)); + types.push_back(MESSAGE_TYPE_LOG_RICH); + joined_log_strings.clear(); + } + strings.push_back(output_string.message); + types.push_back(MESSAGE_TYPE_LOG_RICH); } else { joined_log_strings.push_back(output_string.message); } diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index c209c67dcb0..408d6af0226 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -428,6 +428,9 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da case RemoteDebugger::MESSAGE_TYPE_LOG: { msg_type = EditorLog::MSG_TYPE_STD; } break; + case RemoteDebugger::MESSAGE_TYPE_LOG_RICH: { + msg_type = EditorLog::MSG_TYPE_STD_RICH; + } break; case RemoteDebugger::MESSAGE_TYPE_ERROR: { msg_type = EditorLog::MSG_TYPE_ERROR; } break;