dap: Reply to RunInTerminal

helix-dap/src/client.rs

@@ -262,10 +262,11 @@ impl Client {
     pub fn reply(
         &self,
         request_seq: u64,
-        command: String,
+        command: &str,
         result: core::result::Result<Value, Error>,
     ) -> impl Future<Output = Result<()>> {
         let server_tx = self.server_tx.clone();
+        let command = command.to_string();
 
         async move {
             let response = match result {

helix-dap/src/types.rs

@@ -545,11 +545,11 @@ pub mod requests {
 
     // Reverse Requests
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct RunInTerminalResponse {
-        pub process_id: Option<usize>,
+        pub process_id: Option<u32>,
-        pub shell_process_id: Option<usize>,
+        pub shell_process_id: Option<u32>,
     }
 
     #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
@@ -557,7 +557,7 @@ pub mod requests {
     pub struct RunInTerminalArguments {
         pub kind: Option<String>,
         pub title: Option<String>,
-        pub cwd: String,
+        pub cwd: Option<String>,
         pub args: Vec<String>,
         pub env: Option<HashMap<String, Option<String>>>,
     }

helix-term/src/application.rs

@@ -320,15 +320,15 @@ impl Application {
 
     pub async fn handle_debugger_message(&mut self, payload: helix_dap::Payload) {
         use crate::commands::dap::{breakpoints_changed, resume_application, select_thread_id};
+        use dap::requests::RunInTerminal;
         use helix_dap::{events, Event};
 
-        match payload {
-            Payload::Event(ev) => {
         let debugger = match self.editor.debugger.as_mut() {
             Some(debugger) => debugger,
             None => return,
         };
-                match ev {
+        match payload {
+            Payload::Event(ev) => match ev {
                 Event::Stopped(events::Stopped {
                     thread_id,
                     description,
@@ -465,16 +465,32 @@ impl Application {
                     log::warn!("Unhandled event {:?}", ev);
                     return; // return early to skip render
                 }
-                }
+            },
-            }
             Payload::Response(_) => unreachable!(),
             Payload::Request(request) => match request.command.as_str() {
-                dap::requests::RunInTerminal::COMMAND => {
+                RunInTerminal::COMMAND => {
                     let arguments: dap::requests::RunInTerminalArguments =
                         serde_json::from_value(request.arguments.unwrap_or_default()).unwrap();
                     // TODO: no unwrap
 
-                    // TODO: dap reply
+                    // TODO: handle cwd
+                    let process = std::process::Command::new("tmux")
+                        .arg("split-window")
+                        .arg(arguments.args.join(" ")) // TODO: first arg is wrong, it uses current dir
+                        .spawn()
+                        .unwrap();
+
+                    let _ = debugger
+                        .reply(
+                            request.seq,
+                            dap::requests::RunInTerminal::COMMAND,
+                            serde_json::to_value(dap::requests::RunInTerminalResponse {
+                                process_id: Some(process.id()),
+                                shell_process_id: None,
+                            })
+                            .map_err(|e| e.into()),
+                        )
+                        .await;
                 }
                 _ => log::error!("DAP reverse request not implemented: {:?}", request),
             },