andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-01-19 13:37:06 +04:00
Code Issues Projects Releases Wiki Activity

dap: fix runInTerminal with lldb-vscode

Browse Source
This commit is contained in:
Blaž Hrastnik 2022-02-17 12:22:48 +09:00
parent 4e1b3b12f3
commit 7b1d682fe5
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
helix-term/src/application.rs
View File

@ -479,10 +479,28 @@ pub async fn handle_debugger_message(&mut self, payload: helix_dap::Payload) {
Payload::Response(_) => unreachable!(),
Payload::Request(request) => match request.command.as_str() {
RunInTerminal::COMMAND => {
let arguments: dap::requests::RunInTerminalArguments =
let mut arguments: dap::requests::RunInTerminalArguments =
serde_json::from_value(request.arguments.unwrap_or_default()).unwrap();
// TODO: no unwrap
log::error!("run_in_terminal {:?}", arguments);
// HAXX: lldb-vscode uses $CWD/lldb-vscode which is wrong
let program = arguments.args[0]
.strip_prefix(
std::env::current_dir()
.expect("Couldn't get current working directory")
.as_path()
.to_str()
.unwrap(),
)
.and_then(|arg| arg.strip_prefix('/'))
.map(|arg| arg.to_owned())
.unwrap_or_else(|| arguments.args[0].clone());
arguments.args[0] = program;
log::error!("{}", arguments.args.join(" "));
// TODO: handle cwd
let process = std::process::Command::new("tmux")
.arg("split-window")

4
helix-term/src/commands/dap.rs
View File

@ -392,13 +392,13 @@ fn debug_parameter_prompt(
Ok(call)
});
cx.jobs.callback(callback);
} else if let Err(e) = dap_start_impl(
} else if let Err(err) = dap_start_impl(
cx,
Some(&config_name),
None,
Some(params.iter().map(|x| x.into()).collect()),
) {
cx.editor.set_error(e.to_string());
cx.editor.set_error(err.to_string());
}
},
)