git.iko.soy/helix
on master help sign in
Support remote debug adapter
4ee66b8Dmitry Sharshakov
helix-term/src/commands.rs+36−4
compare with master
unifiedsplit
@@ -2032,7 +2032,25 @@ mod cmd {
2032 0 => None,
2032 0 => None,
2033 _ => Some(args.remove(0)),
2033 _ => Some(args.remove(0)),
2034 };
2034 };
2035− dap_start_impl(&mut cx.editor, name, Some(args));
2035+ dap_start_impl(&mut cx.editor, name, None, Some(args));
2036+ Ok(())
2037+ }
2038+
2039+ fn debug_remote(
2040+ cx: &mut compositor::Context,
2041+ args: &[&str],
2042+ _event: PromptEvent,
2043+ ) -> anyhow::Result<()> {
2044+ let mut args = args.to_owned();
2045+ let address = match args.len() {
2046+ 0 => None,
2047+ _ => Some(args.remove(0).parse().unwrap()),
2048+ };
2049+ let name = match args.len() {
2050+ 0 => None,
2051+ _ => Some(args.remove(0)),
2052+ };
2053+ dap_start_impl(&mut cx.editor, name, address, Some(args));
2036 Ok(())
2054 Ok(())
2037 }
2055 }
2038
2056
@@ -2282,6 +2300,13 @@ mod cmd {
2282 fun: debug_start,
2300 fun: debug_start,
2283 completer: Some(completers::filename),
2301 completer: Some(completers::filename),
2284 },
2302 },
2303+ TypableCommand {
2304+ name: "debug-remote",
2305+ alias: Some("dbg-tcp"),
2306+ doc: "Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters.",
2307+ fun: debug_remote,
2308+ completer: Some(completers::filename),
2309+ },
2285 TypableCommand {
2310 TypableCommand {
2286 name: "debug-eval",
2311 name: "debug-eval",
2287 alias: None,
2312 alias: None,
@@ -4406,7 +4431,12 @@ fn suspend(_cx: &mut Context) {
4406}
4431}
4407
4432
4408// DAP
4433// DAP
4434+fn dap_start_impl(
4435+ editor: &mut Editor,
4436+ name: Option<&str>,
4437+ socket: Option<std::net::SocketAddr>,
4409−fn dap_start_impl(editor: &mut Editor, name: Option<&str>, params: Option<Vec<&str>>) {
4438+ params: Option<Vec<&str>>,
4439+) {
4410 use helix_dap::Client;
4440 use helix_dap::Client;
4411 use helix_lsp::block_on;
4441 use helix_lsp::block_on;
4412 use serde_json::to_value;
4442 use serde_json::to_value;
@@ -4435,8 +4465,10 @@ fn dap_start_impl(editor: &mut Editor, name: Option<&str>, params: Option<Vec<&s
4435 }
4465 }
4436 };
4466 };
4437
4467
4438− let started = Client::process(config.clone(), 0);
4439− let (mut debugger, events) = block_on(started).unwrap();
4468+ let (mut debugger, events) = match socket {
4469+ Some(socket) => block_on(Client::tcp(socket, 0)).unwrap(),
4470+ None => block_on(Client::process(config.clone(), 0)).unwrap(),
4471+ };
4440
4472
4441 let request = debugger.initialize(config.name.clone());
4473 let request = debugger.initialize(config.name.clone());
4442 let _ = block_on(request).unwrap();
4474 let _ = block_on(request).unwrap();