diff --git a/helix-dap/examples/dap-basic.rs b/helix-dap/examples/dap-basic.rs index 76fc0dd3f..fb52f8553 100644 --- a/helix-dap/examples/dap-basic.rs +++ b/helix-dap/examples/dap-basic.rs @@ -1,5 +1,7 @@ -use helix_dap::{Client, Result, SourceBreakpoint}; +use helix_dap::{Client, Event, OutputEventBody, Result, SourceBreakpoint}; use serde::{Deserialize, Serialize}; +use serde_json::from_value; +use tokio::sync::mpsc::Receiver; #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)] #[serde(rename_all = "camelCase")] @@ -8,6 +10,12 @@ struct LaunchArguments { program: String, } +async fn output(mut output_event: Receiver) { + let body: OutputEventBody = + from_value(output_event.recv().await.unwrap().body.unwrap()).unwrap(); + println!("{:?}", body); +} + #[tokio::main] pub async fn main() -> Result<()> { let base_config = fern::Dispatch::new().level(log::LevelFilter::Info); @@ -25,6 +33,9 @@ pub async fn main() -> Result<()> { println!("create: {:?}", client); let mut client = client?; + let output_event = client.listen_for_event("output".to_owned()).await; + tokio::spawn(output(output_event)); + println!("init: {:?}", client.initialize("go".to_owned()).await); println!("caps: {:#?}", client.capabilities()); diff --git a/helix-dap/src/client.rs b/helix-dap/src/client.rs index 7ce7833d3..ef7bb1530 100644 --- a/helix-dap/src/client.rs +++ b/helix-dap/src/client.rs @@ -254,6 +254,19 @@ struct VariablesResponseBody { variables: Vec, } +#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct OutputEventBody { + pub output: String, + pub category: Option, + pub group: Option, + pub line: Option, + pub column: Option, + pub variables_reference: Option, + pub source: Option, + pub data: Option, +} + #[derive(Debug)] pub struct Client { id: usize, diff --git a/helix-dap/src/lib.rs b/helix-dap/src/lib.rs index 1e545fd89..408f4d3d9 100644 --- a/helix-dap/src/lib.rs +++ b/helix-dap/src/lib.rs @@ -1,7 +1,7 @@ mod client; mod transport; -pub use client::{Breakpoint, Client, SourceBreakpoint}; +pub use client::{Breakpoint, Client, OutputEventBody, SourceBreakpoint}; pub use transport::{Event, Payload, Request, Response, Transport}; use thiserror::Error;