mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 19:37:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Disable continuing when running

Browse source
This commit is contained in:
Dmitry Sharshakov 2021-08-21 20:55:45 +03:00
parent 5230a2b669
commit f3e47bfee4
No known key found for this signature in database
GPG key ID: 471FD32E15FD8473
3 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,7 @@ pub struct Client {
pub breakpoints: HashMap<PathBuf, Vec<SourceBreakpoint>>, pub breakpoints: HashMap<PathBuf, Vec<SourceBreakpoint>>,
// TODO: multiple threads support // TODO: multiple threads support
pub stack_pointer: Option<StackFrame>, pub stack_pointer: Option<StackFrame>,
pub is_running: bool,
} }
impl Client { impl Client {
@ -51,6 +52,7 @@ impl Client {
// //
breakpoints: HashMap::new(), breakpoints: HashMap::new(),
stack_pointer: None, stack_pointer: None,
is_running: false,
}; };
tokio::spawn(Self::recv(server_rx, client_rx)); tokio::spawn(Self::recv(server_rx, client_rx));

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

@ -195,6 +195,7 @@ impl Application {
Payload::Event(ev) => { Payload::Event(ev) => {
match &ev.event[..] { match &ev.event[..] {
"stopped" => { "stopped" => {
debugger.is_running = false;
let main = debugger let main = debugger
.threads() .threads()
.await .await

12
helix-term/src/commands.rs
View file

@ -4319,8 +4319,14 @@ fn dap_run(cx: &mut Context) {
use helix_lsp::block_on; use helix_lsp::block_on;
if let Some(debugger) = &mut cx.editor.debugger { if let Some(debugger) = &mut cx.editor.debugger {
if debugger.is_running {
cx.editor
.set_status("Debuggee is already running".to_owned());
return;
}
let request = debugger.configuration_done(); let request = debugger.configuration_done();
let _ = block_on(request).unwrap(); let _ = block_on(request).unwrap();
debugger.is_running = true;
} }
} }
@ -4328,10 +4334,16 @@ fn dap_continue(cx: &mut Context) {
use helix_lsp::block_on; use helix_lsp::block_on;
if let Some(debugger) = &mut cx.editor.debugger { if let Some(debugger) = &mut cx.editor.debugger {
if debugger.is_running {
cx.editor
.set_status("Debuggee is already running".to_owned());
return;
}
// assume 0 to continue all threads for now // assume 0 to continue all threads for now
// FIXME: spec conformant behavior here // FIXME: spec conformant behavior here
let request = debugger.continue_thread(0); let request = debugger.continue_thread(0);
let _ = block_on(request).unwrap(); let _ = block_on(request).unwrap();
debugger.is_running = true;
} }
} }