From a421ee6ebb95ec4afb4e0d4f158a3704e62efea9 Mon Sep 17 00:00:00 2001 From: nikitalita <69168929+nikitalita@users.noreply.github.com> Date: Tue, 11 Mar 2025 22:26:57 -0700 Subject: [PATCH] dap: don't show ending session message unless initialized --- src/common/scripting/dap/ZScriptDebugger.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common/scripting/dap/ZScriptDebugger.cpp b/src/common/scripting/dap/ZScriptDebugger.cpp index 7065e4b466..99435d51b4 100644 --- a/src/common/scripting/dap/ZScriptDebugger.cpp +++ b/src/common/scripting/dap/ZScriptDebugger.cpp @@ -34,7 +34,10 @@ void ZScriptDebugger::StartSession(std::shared_ptr session) { if (m_session) { - LogInternalError("Session is already active, ending it first!"); + if (m_initialized) + { + LogInternalError("Session is already active, ending it first!"); + } EndSession(); } m_initialized = false; @@ -74,11 +77,10 @@ bool ZScriptDebugger::EndSession(bool closed) m_executionManager->Close(); if (m_session) { - LogInternal("Ending DAP debugging session."); if (!closed && m_initialized) { + LogInternal("Ending DAP debugging session."); SendEvent(dap::TerminatedEvent()); - // LogInternal("Sent terminate event."); } } m_initialized = false; @@ -262,6 +264,7 @@ dap::ResponseOrError ZScriptDebugger::Initialize(const { m_clientCaps = request; dap::InitializeResponse response; + LogInternal("Initializing DAP session..."); response.supportsConfigurationDoneRequest = true; response.supportsLoadedSourcesRequest = true; response.supportedChecksumAlgorithms = {"CRC32"};