git.iko.soy/helix
on master help sign in
dap: move launch request argumets outside of client
commit6bb653f820998a9a33db3dabf815a761b1c97bfa authorDmitry Sharshakov <d3dx12.xx@gmail.com> dateFri 13 Aug 2021, 20:24 (5 years ago) parent3d64cf8
2 files changed+17−17
compare with master
unifiedsplit
helix-dap/examples/dap-basic.rs+15−1 helix-dap/src/client.rs+2−16
helix-dap/examples/dap-basic.rs+15−1
@@ -1,4 +1,12 @@
11use helix_dap::{Client, Result, SourceBreakpoint};
2+use serde::{Deserialize, Serialize};
3+
4+#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
5+#[serde(rename_all = "camelCase")]
6+struct LaunchArguments {
7+ mode: String,
8+ program: String,
9+}
210
311#[tokio::main]
412pub async fn main() -> Result<()> {
@@ -19,9 +27,15 @@ pub async fn main() -> Result<()> {
1927
2028 println!("init: {:?}", client.initialize("go".to_owned()).await);
2129 println!("caps: {:#?}", client.capabilities());
30+
31+ let args = LaunchArguments {
32+ mode: "exec".to_owned(),
33+ program: "/tmp/godebug/main".to_owned(),
34+ };
35+
2236 println!(
2337 "launch: {:?}",
24− client.launch("/tmp/godebug/main".to_owned()).await
38+ client.launch(serde_json::to_value(args)?).await
2539 );
2640
2741 println!(
helix-dap/src/client.rs+2−16
@@ -45,14 +45,6 @@ struct InitializeArguments {
4545 supports_invalidated_event: bool,
4646}
4747
48−// TODO: split out, as it's a debugger-specific payload not covered by standard
49−#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
50−#[serde(rename_all = "camelCase")]
51−struct LaunchArguments {
52− mode: String,
53− program: String,
54−}
55−
5648#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
5749#[serde(rename_all = "camelCase")]
5850pub struct Checksum {
@@ -380,14 +372,8 @@ impl Client {
380372 Ok(())
381373 }
382374
383− pub async fn launch(&mut self, executable: String) -> Result<()> {
384− let args = LaunchArguments {
385− mode: "exec".to_owned(),
386− program: executable,
387− };
388−
389− self.request("launch".to_owned(), to_value(args).ok())
390− .await?;
375+ pub async fn launch(&mut self, args: Value) -> Result<()> {
376+ self.request("launch".to_owned(), Some(args)).await?;
391377
392378 match self
393379 .server_rx