mirror of
https://github.com/helix-editor/helix.git
synced 2024-11-23 18:06:18 +04:00
Merge branch 'debug' of https://github.com/sh7dm/helix into debug
This commit is contained in:
Dmitry Sharshakov
commit
7233ab2deb
@ -187,76 +187,7 @@ pub async fn event_loop(&mut self) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some(payload) = self.editor.debugger_events.next() => {
|
Some(payload) = self.editor.debugger_events.next() => {
|
||||||
if self.editor.debugger.is_none() {
|
self.handle_debugger_message(payload).await;
|
||||||
continue;
|
|
||||||
}
|
|
||||||
let mut debugger = self.editor.debugger.as_mut().unwrap();
|
|
||||||
match payload {
|
|
||||||
Payload::Event(ev) => {
|
|
||||||
match &ev.event[..] {
|
|
||||||
"stopped" => {
|
|
||||||
debugger.is_running = false;
|
|
||||||
let main = debugger
|
|
||||||
.threads()
|
|
||||||
.await
|
|
||||||
.ok()
|
|
||||||
.and_then(|threads| threads.get(0).cloned());
|
|
||||||
if let Some(main) = main {
|
|
||||||
let (bt, _) = debugger.stack_trace(main.id).await.unwrap();
|
|
||||||
debugger.stack_pointer = bt.get(0).cloned();
|
|
||||||
}
|
|
||||||
|
|
||||||
let body: helix_dap::events::Stopped = from_value(ev.body.expect("`stopped` event must have a body")).unwrap();
|
|
||||||
let scope = match body.thread_id {
|
|
||||||
Some(id) => format!("Thread {}", id),
|
|
||||||
None => "Target".to_owned(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut status = format!("{} stopped because of {}", scope, body.reason);
|
|
||||||
if let Some(desc) = body.description {
|
|
||||||
status.push_str(&format!(" {}", desc));
|
|
||||||
}
|
|
||||||
if let Some(text) = body.text {
|
|
||||||
status.push_str(&format!(" {}", text));
|
|
||||||
}
|
|
||||||
if body.all_threads_stopped == Some(true) {
|
|
||||||
status.push_str(" (all threads stopped)");
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(helix_dap::StackFrame {
|
|
||||||
source: Some(helix_dap::Source {
|
|
||||||
path: Some(src),
|
|
||||||
..
|
|
||||||
}),
|
|
||||||
..
|
|
||||||
}) = &debugger.stack_pointer {
|
|
||||||
let path = src.clone().into();
|
|
||||||
self.editor.open(path, helix_view::editor::Action::Replace).unwrap();
|
|
||||||
}
|
|
||||||
self.editor.set_status(status);
|
|
||||||
self.render();
|
|
||||||
}
|
|
||||||
"output" => {
|
|
||||||
let body: helix_dap::events::Output = from_value(ev.body.expect("`output` event must have a body")).unwrap();
|
|
||||||
|
|
||||||
let prefix = match body.category {
|
|
||||||
Some(category) => format!("Debug ({}):", category),
|
|
||||||
None => "Debug:".to_owned(),
|
|
||||||
};
|
|
||||||
|
|
||||||
self.editor.set_status(format!("{} {}", prefix, body.output));
|
|
||||||
self.render();
|
|
||||||
}
|
|
||||||
"initialized" => {
|
|
||||||
self.editor.set_status("Debugged application started".to_owned());
|
|
||||||
self.render();
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Payload::Response(_) => unreachable!(),
|
|
||||||
Payload::Request(_) => todo!(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Some(callback) = self.jobs.futures.next() => {
|
Some(callback) = self.jobs.futures.next() => {
|
||||||
self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
|
self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
|
||||||
@ -319,7 +250,83 @@ pub fn handle_terminal_events(&mut self, event: Option<Result<Event, crossterm::
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn handle_debugger_message(&mut self, _call: ()) {
|
pub async fn handle_debugger_message(&mut self, payload: helix_dap::Payload) {
|
||||||
|
let mut debugger = match self.editor.debugger.as_mut() {
|
||||||
|
Some(debugger) => debugger,
|
||||||
|
None => return,
|
||||||
|
};
|
||||||
|
|
||||||
|
match payload {
|
||||||
|
Payload::Event(ev) => match &ev.event[..] {
|
||||||
|
"stopped" => {
|
||||||
|
debugger.is_running = false;
|
||||||
|
let main = debugger
|
||||||
|
.threads()
|
||||||
|
.await
|
||||||
|
.ok()
|
||||||
|
.and_then(|threads| threads.get(0).cloned());
|
||||||
|
if let Some(main) = main {
|
||||||
|
let (bt, _) = debugger.stack_trace(main.id).await.unwrap();
|
||||||
|
debugger.stack_pointer = bt.get(0).cloned();
|
||||||
|
}
|
||||||
|
|
||||||
|
let body: helix_dap::events::Stopped =
|
||||||
|
from_value(ev.body.expect("`stopped` event must have a body")).unwrap();
|
||||||
|
let scope = match body.thread_id {
|
||||||
|
Some(id) => format!("Thread {}", id),
|
||||||
|
None => "Target".to_owned(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut status = format!("{} stopped because of {}", scope, body.reason);
|
||||||
|
if let Some(desc) = body.description {
|
||||||
|
status.push_str(&format!(" {}", desc));
|
||||||
|
}
|
||||||
|
if let Some(text) = body.text {
|
||||||
|
status.push_str(&format!(" {}", text));
|
||||||
|
}
|
||||||
|
if body.all_threads_stopped == Some(true) {
|
||||||
|
status.push_str(" (all threads stopped)");
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(helix_dap::StackFrame {
|
||||||
|
source:
|
||||||
|
Some(helix_dap::Source {
|
||||||
|
path: Some(src), ..
|
||||||
|
}),
|
||||||
|
..
|
||||||
|
}) = &debugger.stack_pointer
|
||||||
|
{
|
||||||
|
let path = src.clone().into();
|
||||||
|
self.editor
|
||||||
|
.open(path, helix_view::editor::Action::Replace)
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
self.editor.set_status(status);
|
||||||
|
self.render();
|
||||||
|
}
|
||||||
|
"output" => {
|
||||||
|
let body: helix_dap::events::Output =
|
||||||
|
from_value(ev.body.expect("`output` event must have a body")).unwrap();
|
||||||
|
|
||||||
|
let prefix = match body.category {
|
||||||
|
Some(category) => format!("Debug ({}):", category),
|
||||||
|
None => "Debug:".to_owned(),
|
||||||
|
};
|
||||||
|
|
||||||
|
self.editor
|
||||||
|
.set_status(format!("{} {}", prefix, body.output));
|
||||||
|
self.render();
|
||||||
|
}
|
||||||
|
"initialized" => {
|
||||||
|
self.editor
|
||||||
|
.set_status("Debugged application started".to_owned());
|
||||||
|
self.render();
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
},
|
||||||
|
Payload::Response(_) => unreachable!(),
|
||||||
|
Payload::Request(_) => todo!(),
|
||||||
|
}
|
||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user