TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

dap: Reply to RunInTerminal

Browse source
This commit is contained in:
Blaž Hrastnik 2021-12-05 14:43:34 +09:00
parent d5d1a9b1ae
commit 2b4de41bf0
3 changed files with 160 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
helix-dap/src/client.rs
View file

@ -262,10 +262,11 @@ impl Client {
pub fn reply( pub fn reply(
&self, &self,
request_seq: u64, request_seq: u64,
command: String, command: &str,
result: core::result::Result<Value, Error>, result: core::result::Result<Value, Error>,
) -> impl Future<Output = Result<()>> { ) -> impl Future<Output = Result<()>> {
let server_tx = self.server_tx.clone(); let server_tx = self.server_tx.clone();
let command = command.to_string();
async move { async move {
let response = match result { let response = match result {

8
helix-dap/src/types.rs
View file

@ -545,11 +545,11 @@ pub mod requests {
// Reverse Requests // Reverse Requests
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)] #[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct RunInTerminalResponse { pub struct RunInTerminalResponse {
pub process_id: Option<usize>, pub process_id: Option<u32>,
pub shell_process_id: Option<usize>, pub shell_process_id: Option<u32>,
} }
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)] #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
@ -557,7 +557,7 @@ pub mod requests {
pub struct RunInTerminalArguments { pub struct RunInTerminalArguments {
pub kind: Option<String>, pub kind: Option<String>,
pub title: Option<String>, pub title: Option<String>,
pub cwd: String, pub cwd: Option<String>,
pub args: Vec<String>, pub args: Vec<String>,
pub env: Option<HashMap<String, Option<String>>>, pub env: Option<HashMap<String, Option<String>>>,
} }

30
helix-term/src/application.rs
View file

@ -320,15 +320,15 @@ impl Application {
pub async fn handle_debugger_message(&mut self, payload: helix_dap::Payload) { pub async fn handle_debugger_message(&mut self, payload: helix_dap::Payload) {
use crate::commands::dap::{breakpoints_changed, resume_application, select_thread_id}; use crate::commands::dap::{breakpoints_changed, resume_application, select_thread_id};
use dap::requests::RunInTerminal;
use helix_dap::{events, Event}; use helix_dap::{events, Event};
match payload {
Payload::Event(ev) => {
let debugger = match self.editor.debugger.as_mut() { let debugger = match self.editor.debugger.as_mut() {
Some(debugger) => debugger, Some(debugger) => debugger,
None => return, None => return,
}; };
match ev { match payload {
Payload::Event(ev) => match ev {
Event::Stopped(events::Stopped { Event::Stopped(events::Stopped {
thread_id, thread_id,
description, description,
@ -465,16 +465,32 @@ impl Application {
log::warn!("Unhandled event {:?}", ev); log::warn!("Unhandled event {:?}", ev);
return; // return early to skip render return; // return early to skip render
} }
} },
}
Payload::Response(_) => unreachable!(), Payload::Response(_) => unreachable!(),
Payload::Request(request) => match request.command.as_str() { Payload::Request(request) => match request.command.as_str() {
dap::requests::RunInTerminal::COMMAND => { RunInTerminal::COMMAND => {
let arguments: dap::requests::RunInTerminalArguments = let arguments: dap::requests::RunInTerminalArguments =
serde_json::from_value(request.arguments.unwrap_or_default()).unwrap(); serde_json::from_value(request.arguments.unwrap_or_default()).unwrap();
// TODO: no unwrap // TODO: no unwrap
// TODO: dap reply // TODO: handle cwd
let process = std::process::Command::new("tmux")
.arg("split-window")
.arg(arguments.args.join(" ")) // TODO: first arg is wrong, it uses current dir
.spawn()
.unwrap();
let _ = debugger
.reply(
request.seq,
dap::requests::RunInTerminal::COMMAND,
serde_json::to_value(dap::requests::RunInTerminalResponse {
process_id: Some(process.id()),
shell_process_id: None,
})
.map_err(|e| e.into()),
)
.await;
} }
_ => log::error!("DAP reverse request not implemented: {:?}", request), _ => log::error!("DAP reverse request not implemented: {:?}", request),
}, },