feat: dedicated crate for DAP types (#14906)

Author: matoous

Cargo.lock

@@ -8,6 +8,7 @@ members = [
   "helix-lsp-types",
   "helix-lsp",
   "helix-event",
+  "helix-dap-types",
   "helix-dap",
   "helix-loader",
   "helix-vcs",

Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "helix-dap-types"
+description = "Types for interaction with a debug adapaters, using Debug Adapter Protocol"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
+
+[dependencies]
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"

helix-dap-types/Cargo.toml

@@ -15,6 +15,7 @@ homepage.workspace = true
 [dependencies]
 helix-stdx = { path = "../helix-stdx" }
 helix-core = { path = "../helix-core" }
+helix-dap-types = { path = "../helix-dap-types" }
 
 anyhow = "1.0"
 log = "0.4"

helix-dap/src/types.rs renamed to helix-dap-types/src/lib.rs

@@ -2,10 +2,10 @@ use crate::{
     registry::DebugAdapterId,
     requests::{DisconnectArguments, TerminateArguments},
     transport::{Payload, Request, Response, Transport},
-    types::*,
     Error, Result,
 };
 use helix_core::syntax::config::{DebugAdapterConfig, DebuggerQuirks};
+use helix_dap_types::*;
 
 use serde_json::Value;
 
@@ -249,7 +249,7 @@ impl Client {
     }
 
     /// Execute a RPC request on the debugger.
-    pub fn call<R: crate::types::Request>(
+    pub fn call<R: helix_dap_types::Request>(
         &self,
         arguments: R::Arguments,
     ) -> impl Future<Output = Result<Value>>
@@ -288,7 +288,10 @@ impl Client {
         }
     }
 
-    pub async fn request<R: crate::types::Request>(&self, params: R::Arguments) -> Result<R::Result>
+    pub async fn request<R: helix_dap_types::Request>(
+        &self,
+        params: R::Arguments,
+    ) -> Result<R::Result>
     where
         R::Arguments: serde::Serialize,
         R::Result: core::fmt::Debug, // TODO: temporary

helix-dap/Cargo.toml

@@ -1,11 +1,10 @@
 mod client;
 pub mod registry;
 mod transport;
-mod types;
 
 pub use client::Client;
+pub use helix_dap_types::*;
 pub use transport::{Payload, Response, Transport};
-pub use types::*;
 
 use serde::de::DeserializeOwned;
 
@@ -43,13 +42,13 @@ impl From<sonic_rs::Error> for Error {
 
 #[derive(Debug)]
 pub enum Request {
-    RunInTerminal(<requests::RunInTerminal as types::Request>::Arguments),
-    StartDebugging(<requests::StartDebugging as types::Request>::Arguments),
+    RunInTerminal(<requests::RunInTerminal as helix_dap_types::Request>::Arguments),
+    StartDebugging(<requests::StartDebugging as helix_dap_types::Request>::Arguments),
 }
 
 impl Request {
     pub fn parse(command: &str, arguments: Option<serde_json::Value>) -> Result<Self> {
-        use crate::types::Request as _;
+        use helix_dap_types::Request as _;
 
         let arguments = arguments.unwrap_or_default();
         let request = match command {