git.iko.soy/helix
on master help sign in
Drop and terminate debugger
6709b42Dmitry Sharshakov
helix-term/src/application.rs+3
compare with master
unifiedsplit
@@ -187,6 +187,9 @@ impl Application {
187 }
187 }
188 }
188 }
189 Some(payload) = self.editor.debugger_events.next() => {
189 Some(payload) = self.editor.debugger_events.next() => {
190+ if self.editor.debugger.is_none() {
191+ continue;
192+ }
190 let mut debugger = self.editor.debugger.as_mut().unwrap();
193 let mut debugger = self.editor.debugger.as_mut().unwrap();
191 match payload {
194 match payload {
192 Payload::Event(ev) => {
195 Payload::Event(ev) => {
helix-term/src/commands.rs+1
@@ -4329,5 +4329,6 @@ fn dap_terminate(cx: &mut Context) {
4329 if let Some(debugger) = &mut cx.editor.debugger {
4329 if let Some(debugger) = &mut cx.editor.debugger {
4330 let request = debugger.disconnect();
4330 let request = debugger.disconnect();
4331 let _ = block_on(request).unwrap();
4331 let _ = block_on(request).unwrap();
4332+ cx.editor.debugger = None;
4332 }
4333 }
4333}
4334}