Skip to content

Commit

Permalink
feat(dap): send Disconnect if Terminated event received
Browse files Browse the repository at this point in the history
Send a `Disconnect` DAP request if the `Terminated` event is received.
According to the specification, if the debugging session was started by
as `launch`, the debuggee should be terminated alongside the session. If
instead the session was started as `attach`, it should not be disposed of.

This default behaviour can be overriden if the `supportTerminateDebuggee`
capability is supported by the adapter, through the `Disconnect` request
`terminateDebuggee` argument, as described in
[the specification][discon-spec].

This also implies saving the starting command for a debug sessions, in
order to decide which behaviour should be used, as well as validating the
capabilities of the adapter, in order to decide what the disconnect should
do.

An additional change made is handling of the `Exited` event, showing a
message if the exit code is different than `0`, for the user to be aware
off the termination failure.

[discon-spec]: https://microsoft.github.io/debug-adapter-protocol/specification#Requests_Disconnect

Closes: #4674
Signed-off-by: Filip Dutescu <filip.dutescu@gmail.com>
  • Loading branch information
filipdutescu committed Jan 22, 2023
1 parent d99a720 commit 90e1df2
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 8 deletions.
28 changes: 24 additions & 4 deletions helix-dap/src/client.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use crate::{
requests::DisconnectArguments,
transport::{Payload, Request, Response, Transport},
types::*,
Error, Result, ThreadId,
Expand Down Expand Up @@ -31,6 +32,7 @@ pub struct Client {
_process: Option<Child>,
server_tx: UnboundedSender<Payload>,
request_counter: AtomicU64,
starting_request: StartingRequest,
pub caps: Option<DebuggerCapabilities>,
// thread_id -> frames
pub stack_frames: HashMap<ThreadId, Vec<StackFrame>>,
Expand All @@ -41,6 +43,13 @@ pub struct Client {
pub quirks: DebuggerQuirks,
}

#[derive(Clone, Copy, Debug)]
pub enum StartingRequest {
Launch,
Attach,
None,
}

impl Client {
// Spawn a process and communicate with it by either TCP or stdio
pub async fn process(
Expand Down Expand Up @@ -78,6 +87,7 @@ impl Client {
server_tx,
request_counter: AtomicU64::new(0),
caps: None,
starting_request: StartingRequest::None,
//
stack_frames: HashMap::new(),
thread_states: HashMap::new(),
Expand Down Expand Up @@ -207,6 +217,10 @@ impl Client {
self.id
}

pub fn starting_request(&self) -> StartingRequest {
self.starting_request
}

fn next_request_id(&self) -> u64 {
self.request_counter.fetch_add(1, Ordering::Relaxed)
}
Expand Down Expand Up @@ -334,15 +348,21 @@ impl Client {
Ok(())
}

pub fn disconnect(&self) -> impl Future<Output = Result<Value>> {
self.call::<requests::Disconnect>(())
pub fn disconnect(
&mut self,
args: Option<DisconnectArguments>,
) -> impl Future<Output = Result<Value>> {
self.starting_request = StartingRequest::None;
self.call::<requests::Disconnect>(args)
}

pub fn launch(&self, args: serde_json::Value) -> impl Future<Output = Result<Value>> {
pub fn launch(&mut self, args: serde_json::Value) -> impl Future<Output = Result<Value>> {
self.starting_request = StartingRequest::Launch;
self.call::<requests::Launch>(args)
}

pub fn attach(&self, args: serde_json::Value) -> impl Future<Output = Result<Value>> {
pub fn attach(&mut self, args: serde_json::Value) -> impl Future<Output = Result<Value>> {
self.starting_request = StartingRequest::Attach;
self.call::<requests::Attach>(args)
}

Expand Down
2 changes: 1 addition & 1 deletion helix-dap/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ mod client;
mod transport;
mod types;

pub use client::Client;
pub use client::{Client, StartingRequest};
pub use events::Event;
pub use transport::{Payload, Response, Transport};
pub use types::*;
Expand Down
13 changes: 12 additions & 1 deletion helix-dap/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -391,11 +391,22 @@ pub mod requests {
const COMMAND: &'static str = "attach";
}

#[derive(Debug, Default, PartialEq, Eq, Clone, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct DisconnectArguments {
#[serde(skip_serializing_if = "Option::is_none")]
pub restart: Option<bool>,
#[serde(skip_serializing_if = "Option::is_none")]
pub terminate_debuggee: Option<bool>,
#[serde(skip_serializing_if = "Option::is_none")]
pub suspend_debuggee: Option<bool>,
}

#[derive(Debug)]
pub enum Disconnect {}

impl Request for Disconnect {
type Arguments = ();
type Arguments = Option<DisconnectArguments>;
type Result = ();
const COMMAND: &'static str = "disconnect";
}
Expand Down
2 changes: 1 addition & 1 deletion helix-term/src/commands/dap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ pub fn dap_variables(cx: &mut Context) {
pub fn dap_terminate(cx: &mut Context) {
let debugger = debugger!(cx.editor);

let request = debugger.disconnect();
let request = debugger.disconnect(None);
dap_callback(cx.jobs, request, |editor, _compositor, _response: ()| {
// editor.set_error(format!("Failed to disconnect: {}", e));
editor.debugger = None;
Expand Down
59 changes: 58 additions & 1 deletion helix-view/src/handlers/dap.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use crate::editor::{Action, Breakpoint};
use crate::{align_view, Align, Editor};
use dap::requests::DisconnectArguments;
use helix_core::Selection;
use helix_dap::{self as dap, Client, Payload, Request, ThreadId};
use helix_dap::{self as dap, Client, Payload, Request, StartingRequest, ThreadId};
use helix_lsp::block_on;
use log::warn;
use std::fmt::Write;
Expand Down Expand Up @@ -274,6 +275,62 @@ impl Editor {
self.set_status("Debugged application started");
}; // TODO: do we need to handle error?
}
Event::Terminated(terminated) => {
let restart_args = if let Some(terminated) = terminated {
terminated.restart
} else {
None
};
let restart = restart_args.is_some();
let disconnect_args = Some(DisconnectArguments {
restart: Some(restart),
terminate_debuggee: None,
suspend_debuggee: None,
});

let starting_request = debugger.starting_request();
let result = debugger.disconnect(disconnect_args).await;
if result.is_ok() {
if restart {
if let StartingRequest::None = starting_request {
self.set_error("No starting request found, to be used in restarting the debugging session.");
} else {
log::info!("Attempting to restart debug session.");
let restart_args = restart_args.unwrap();
let relaunch_resp =
if let StartingRequest::Launch = starting_request {
debugger.launch(restart_args).await
} else {
debugger.attach(restart_args).await
};

if let Err(err) = relaunch_resp {
self.set_error(format!(
"Failed to restart debugging session: {:?}",
err
));
}
}
} else {
self.set_status(
"Terminated debugging session and disconnected debugger.",
);
}
} else {
self.set_error(format!(
"Cannot disconnect debugger upon terminated event receival {:?}",
result.err(),
));
}
}
Event::Exited(resp) => {
let exit_code = resp.exit_code;
if exit_code != 0 {
self.set_error(format!(
"Debuggee failed to exit successfully (exit code: {exit_code})."
));
}
}
ev => {
log::warn!("Unhandled event {:?}", ev);
return false; // return early to skip render
Expand Down

0 comments on commit 90e1df2

Please sign in to comment.