Fix unwrap bug in DAP #6786
Fix unwrap bug in DAP #6786
Conversation
| if transport == "tcp" && port_arg.is_some() { | ||
| Self::tcp_process(command, args, port_arg.unwrap(), id).await | ||
| } else if transport == "stdio" { | ||
| Self::stdio(command, args, id) | ||
| } else { | ||
| Result::Err(Error::Other(anyhow!("Incorrect transport {}", transport))) | ||
| match (transport, port_arg) { | ||
| ("tcp", Some(port_arg)) => Self::tcp_process(command, args, port_arg, id).await, | ||
| ("stdio", _) => Self::stdio(command, args, id), | ||
| _ => Result::Err(Error::Other(anyhow!("Incorrect transport {}", transport))), |
There was a problem hiding this comment.
This isn't directly related, but I just wanted to get rid of an unnecessary unwrap. If you want I can separate this to a different PR.
| @@ -321,6 +321,7 @@ impl Editor { | |||
| } | |||
| } | |||
| None => { | |||
| self.debugger = None; | |||
There was a problem hiding this comment.
This seems like a seperate bug fix to me. I think this is correct and needed to ensure that the debugger is actually removed once it terminates, right? This seems like the right fix to me and I ran into this bug before so it's great to see this fixed too
There was a problem hiding this comment.
Yeah it's separate, but related. Without this trying to add a breakpoint after the debugger terminated would show an error, better than crashing but still not great.
There was a problem hiding this comment.
yeah this is what I ran into too in the past, good catch :)
pascalkuthe
added
C-bug
|
Thanks for the quick fix! I'll give it a try today. |
Fixes #6782