diff --git a/crates/debugger_ui/src/session/running/console.rs b/crates/debugger_ui/src/session/running/console.rs index ba46d3af21..5ff9b0d0f1 100644 --- a/crates/debugger_ui/src/session/running/console.rs +++ b/crates/debugger_ui/src/session/running/console.rs @@ -255,36 +255,6 @@ impl Console { cx, ); }); - - // TODO(debugger): make this work again - // let weak_console = cx.weak_entity(); - - // window - // .spawn(cx, |mut cx| async move { - // let response = evaluate_task.await?; - - // weak_console.update_in(&mut cx, |console, window, cx| { - // console.add_message( - // OutputEvent { - // category: None, - // output: response.result, - // group: None, - // variables_reference: Some(response.variables_reference), - // source: None, - // line: None, - // column: None, - // data: None, - // }, - // window, - // cx, - // ); - - // console.variable_list.update(cx, |variable_list, cx| { - // variable_list.invalidate(window, cx); - // }) - // }) - // }) - // .detach_and_log_err(cx); } fn render_console(&self, cx: &Context) -> impl IntoElement { diff --git a/crates/project/src/debugger/session.rs b/crates/project/src/debugger/session.rs index f158344ace..765172f64b 100644 --- a/crates/project/src/debugger/session.rs +++ b/crates/project/src/debugger/session.rs @@ -11,9 +11,9 @@ use super::dap_command::{ use super::dap_store::DapAdapterDelegate; use anyhow::{anyhow, Result}; use collections::{HashMap, IndexMap}; -use dap::adapters::{DapDelegate, DapStatus, DebugAdapterName}; -use dap::client::{DebugAdapterClient, SessionId}; use dap::{ + adapters::{DapDelegate, DapStatus, DebugAdapterName}, + client::{DebugAdapterClient, SessionId}, messages::{self, Events, Message}, requests::SetBreakpoints, Capabilities, ContinueArguments, EvaluateArgumentsContext, Module, SetBreakpointsArguments, @@ -1411,12 +1411,24 @@ impl Session { frame_id, source, }, - |this, _response, cx| { + |this, response, cx| { + this.output.push(dap::OutputEvent { + category: None, + output: response.result.clone(), + group: None, + variables_reference: Some(response.variables_reference), + source: None, + line: None, + column: None, + data: None, + }); + + // TODO(debugger): only invalidate variables & scopes this.invalidate(cx); }, cx, ) - .detach() + .detach(); } pub fn disconnect_client(&mut self, cx: &mut Context) {