llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Jacob Lalonde (Jlalond) <details> <summary>Changes</summary> In my last DAP patch (#<!-- -->123837), we piped the DAP update message into the update event. However, we had the title embedded into the update message. This makes sense for progress Start, but makes the update message look pretty wonky.  Instead, we only use the title when it's the first message, removing the duplicate title problem.  --- Full diff: https://github.com/llvm/llvm-project/pull/124648.diff 2 Files Affected: - (modified) lldb/include/lldb/Core/DebuggerEvents.h (+10-6) - (modified) lldb/test/API/tools/lldb-dap/progress/TestDAP_Progress.py (+5) ``````````diff diff --git a/lldb/include/lldb/Core/DebuggerEvents.h b/lldb/include/lldb/Core/DebuggerEvents.h index 49a4ecf8e537e3..ca06ee835fde38 100644 --- a/lldb/include/lldb/Core/DebuggerEvents.h +++ b/lldb/include/lldb/Core/DebuggerEvents.h @@ -44,12 +44,16 @@ class ProgressEventData : public EventData { uint64_t GetCompleted() const { return m_completed; } uint64_t GetTotal() const { return m_total; } std::string GetMessage() const { - std::string message = m_title; - if (!m_details.empty()) { - message.append(": "); - message.append(m_details); - } - return message; + // Only put the title in the message of the progress create event. + if (m_completed == 0) { + std::string message = m_title; + if (!m_details.empty()) { + message.append(": "); + message.append(m_details); + } + return message; + } else + return !m_details.empty() ? m_details : std::string(); } const std::string &GetTitle() const { return m_title; } const std::string &GetDetails() const { return m_details; } diff --git a/lldb/test/API/tools/lldb-dap/progress/TestDAP_Progress.py b/lldb/test/API/tools/lldb-dap/progress/TestDAP_Progress.py index 36c0cef9c47143..945c3f7633364c 100755 --- a/lldb/test/API/tools/lldb-dap/progress/TestDAP_Progress.py +++ b/lldb/test/API/tools/lldb-dap/progress/TestDAP_Progress.py @@ -41,8 +41,13 @@ def test_output(self): for event in self.dap_server.progress_events: event_type = event["event"] if "progressStart" in event_type: + title = event["body"]["title"] + self.assertIn("Progress tester", title) start_found = True if "progressUpdate" in event_type: + message = event["body"]["message"] + print(f"Progress update: {message}") + self.assertNotIn("Progres tester", message) update_found = True self.assertTrue(start_found) `````````` </details> https://github.com/llvm/llvm-project/pull/124648 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
