From 47a5f0c62068c1bbeca8bfbfa11997160fc007a3 Mon Sep 17 00:00:00 2001 From: Remco Smits Date: Sat, 29 Jun 2024 16:47:27 +0200 Subject: [PATCH] Start wiring through custom launch data --- crates/dap/src/client.rs | 10 ++++------ crates/project/src/project.rs | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/crates/dap/src/client.rs b/crates/dap/src/client.rs index 0ead30b8bcfac0..010a2f0154d222 100644 --- a/crates/dap/src/client.rs +++ b/crates/dap/src/client.rs @@ -15,7 +15,7 @@ use futures::{ AsyncBufRead, AsyncReadExt, AsyncWrite, SinkExt as _, StreamExt, }; use gpui::{AppContext, AsyncAppContext}; -use serde_json::json; +use serde_json::Value; use smol::{ io::BufReader, net::TcpStream, @@ -244,11 +244,9 @@ impl DebugAdapterClient { Ok(capabilities) } - pub async fn launch(&self) -> Result<()> { - self.request::(LaunchRequestArguments { - raw: json!({"noDebug": false}), - }) - .await + pub async fn launch(&self, custom: Value) -> Result<()> { + self.request::(LaunchRequestArguments { raw: custom }) + .await } pub async fn resume(&self, thread_id: u64) { diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index 70ffb5bc70be2f..22ef2ab9c95a68 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -86,6 +86,7 @@ use rpc::{ErrorCode, ErrorExt as _}; use search::SearchQuery; use search_history::SearchHistory; use serde::Serialize; +use serde_json::json; use settings::{watch_config_file, Settings, SettingsLocation, SettingsStore}; use sha2::{Digest, Sha256}; use similar::{ChangeTag, TextDiff}; @@ -1117,7 +1118,7 @@ impl Project { client.configuration_done().await.log_err()?; // launch/attach request - client.launch().await.log_err()?; + client.launch(json!({"noDebug": false})).await.log_err()?; let client = Arc::new(client);