mirror of
https://github.com/ilyakooo0/helix.git
synced 2024-09-12 00:07:42 +03:00
feat(dap): implement Restart request (#5651)
Add a restart debug session command, which would issue a [Restart Request][1], if the debugger supports it and a session is running. It uses the same arguments and requests used to start the initial session, when recreating it. It builds upon #5532, making use of the changes to the termination workflow of a session. [1]: https://microsoft.github.io/debug-adapter-protocol/specification#Requests_Restart Closes: #5594 Signed-off-by: Filip Dutescu <filip.dutescu@gmail.com>
This commit is contained in:
parent
39d5fb0e59
commit
376c19e06b
@ -33,6 +33,7 @@ pub struct Client {
|
||||
server_tx: UnboundedSender<Payload>,
|
||||
request_counter: AtomicU64,
|
||||
connection_type: Option<ConnectionType>,
|
||||
starting_request_args: Option<Value>,
|
||||
pub caps: Option<DebuggerCapabilities>,
|
||||
// thread_id -> frames
|
||||
pub stack_frames: HashMap<ThreadId, Vec<StackFrame>>,
|
||||
@ -87,6 +88,7 @@ pub fn streams(
|
||||
request_counter: AtomicU64::new(0),
|
||||
caps: None,
|
||||
connection_type: None,
|
||||
starting_request_args: None,
|
||||
stack_frames: HashMap::new(),
|
||||
thread_states: HashMap::new(),
|
||||
thread_id: None,
|
||||
@ -158,6 +160,10 @@ async fn get_port() -> Option<u16> {
|
||||
)
|
||||
}
|
||||
|
||||
pub fn starting_request_args(&self) -> &Option<Value> {
|
||||
&self.starting_request_args
|
||||
}
|
||||
|
||||
pub async fn tcp_process(
|
||||
cmd: &str,
|
||||
args: Vec<&str>,
|
||||
@ -356,14 +362,25 @@ pub fn disconnect(
|
||||
|
||||
pub fn launch(&mut self, args: serde_json::Value) -> impl Future<Output = Result<Value>> {
|
||||
self.connection_type = Some(ConnectionType::Launch);
|
||||
self.starting_request_args = Some(args.clone());
|
||||
self.call::<requests::Launch>(args)
|
||||
}
|
||||
|
||||
pub fn attach(&mut self, args: serde_json::Value) -> impl Future<Output = Result<Value>> {
|
||||
self.connection_type = Some(ConnectionType::Attach);
|
||||
self.starting_request_args = Some(args.clone());
|
||||
self.call::<requests::Attach>(args)
|
||||
}
|
||||
|
||||
pub fn restart(&self) -> impl Future<Output = Result<Value>> {
|
||||
let args = if let Some(args) = &self.starting_request_args {
|
||||
args.clone()
|
||||
} else {
|
||||
Value::Null
|
||||
};
|
||||
self.call::<requests::Restart>(args)
|
||||
}
|
||||
|
||||
pub async fn set_breakpoints(
|
||||
&self,
|
||||
file: PathBuf,
|
||||
|
@ -378,7 +378,7 @@ pub enum Launch {}
|
||||
|
||||
impl Request for Launch {
|
||||
type Arguments = Value;
|
||||
type Result = Value;
|
||||
type Result = ();
|
||||
const COMMAND: &'static str = "launch";
|
||||
}
|
||||
|
||||
@ -387,7 +387,7 @@ pub enum Attach {}
|
||||
|
||||
impl Request for Attach {
|
||||
type Arguments = Value;
|
||||
type Result = Value;
|
||||
type Result = ();
|
||||
const COMMAND: &'static str = "attach";
|
||||
}
|
||||
|
||||
@ -402,6 +402,15 @@ pub struct DisconnectArguments {
|
||||
pub suspend_debuggee: Option<bool>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum Restart {}
|
||||
|
||||
impl Request for Restart {
|
||||
type Arguments = Value;
|
||||
type Result = ();
|
||||
const COMMAND: &'static str = "restart";
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum Disconnect {}
|
||||
|
||||
|
@ -430,6 +430,7 @@ pub fn doc(&self) -> &str {
|
||||
goto_next_paragraph, "Goto next paragraph",
|
||||
goto_prev_paragraph, "Goto previous paragraph",
|
||||
dap_launch, "Launch debug target",
|
||||
dap_restart, "Restart debugging session",
|
||||
dap_toggle_breakpoint, "Toggle breakpoint",
|
||||
dap_continue, "Continue program execution",
|
||||
dap_pause, "Pause program execution",
|
||||
|
@ -289,6 +289,36 @@ pub fn dap_launch(cx: &mut Context) {
|
||||
))));
|
||||
}
|
||||
|
||||
pub fn dap_restart(cx: &mut Context) {
|
||||
let debugger = match &cx.editor.debugger {
|
||||
Some(debugger) => debugger,
|
||||
None => {
|
||||
cx.editor.set_error("Debugger is not running");
|
||||
return;
|
||||
}
|
||||
};
|
||||
if !debugger
|
||||
.capabilities()
|
||||
.supports_restart_request
|
||||
.unwrap_or(false)
|
||||
{
|
||||
cx.editor
|
||||
.set_error("Debugger does not support session restarts");
|
||||
return;
|
||||
}
|
||||
if debugger.starting_request_args().is_none() {
|
||||
cx.editor
|
||||
.set_error("No arguments found with which to restart the sessions");
|
||||
return;
|
||||
}
|
||||
|
||||
dap_callback(
|
||||
cx.jobs,
|
||||
debugger.restart(),
|
||||
|editor, _compositor, _resp: ()| editor.set_status("Debugging session restarted"),
|
||||
);
|
||||
}
|
||||
|
||||
fn debug_parameter_prompt(
|
||||
completions: Vec<DebugConfigCompletion>,
|
||||
config_name: String,
|
||||
|
@ -223,6 +223,7 @@ pub fn default() -> HashMap<Mode, Keymap> {
|
||||
"'" => last_picker,
|
||||
"g" => { "Debug (experimental)" sticky=true
|
||||
"l" => dap_launch,
|
||||
"r" => dap_restart,
|
||||
"b" => dap_toggle_breakpoint,
|
||||
"c" => dap_continue,
|
||||
"h" => dap_pause,
|
||||
|
Loading…
Reference in New Issue
Block a user