ilyakooo0/helix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/helix.git synced 2024-11-10 14:46:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use tagged enum for handling DAP payloads

Browse Source
This commit is contained in:
Dmitry Sharshakov 2021-08-15 10:08:51 +03:00 committed by Blaž Hrastnik
parent 36fb8d1b1a
commit 279db98d3c
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
helix-dap/src/client.rs
View File

@ -461,7 +461,6 @@ impl Client {
let req = Request {
back_ch: Some(callback_rx),
seq: self.next_request_id(),
msg_type: "request".to_owned(),
command,
arguments,
};

10
helix-dap/src/transport.rs
View File

@ -18,8 +18,6 @@ pub struct Request {
#[serde(skip)]
pub back_ch: Option<Sender<Result<Response>>>,
pub seq: u64,
#[serde(rename = "type")]
pub msg_type: String,
pub command: String,
pub arguments: Option<Value>,
}
@ -27,8 +25,6 @@ pub struct Request {
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
pub struct Response {
// seq is omitted as unused and is not sent by some implementations
#[serde(rename = "type")]
pub msg_type: String,
pub request_seq: u64,
pub success: bool,
pub command: String,
@ -39,14 +35,12 @@ pub struct Response {
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
pub struct Event {
// seq is omitted as unused and is not sent by some implementations
#[serde(rename = "type")]
pub msg_type: String,
pub event: String,
pub body: Option<Value>,
}
#[derive(Debug, Clone, Deserialize, Serialize)]
#[serde(untagged)]
#[serde(tag = "type", rename_all = "camelCase")]
pub enum Payload {
// type = "event"
Event(Event),
@ -135,7 +129,7 @@ impl Transport {
server_stdin: &mut Box<dyn AsyncWrite + Unpin + Send>,
req: Request,
) -> Result<()> {
let json = serde_json::to_string(&req)?;
let json = serde_json::to_string(&Payload::Request(req.clone()))?;
if let Some(back) = req.back_ch {
self.pending_requests.lock().await.insert(req.seq, back);
}