kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fetch stack traces for all threads when debugger sets all_thread_stopped flag

Browse source
This commit is contained in:
Dmitry Sharshakov 2021-09-05 16:09:38 +03:00
parent bdd636d8ee
commit c9cd06e904
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,9 @@ use helix_dap::Payload;
use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap}; use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
use helix_view::{theme, Editor}; use helix_view::{theme, Editor};
use crate::{args::Args, compositor::Compositor, config::Config, job::Jobs, ui}; use crate::{
args::Args, commands::fetch_stack_trace, compositor::Compositor, config::Config, job::Jobs, ui,
};
use log::error; use log::error;
use std::{ use std::{
@ -273,7 +275,16 @@ impl Application {
all_threads_stopped, all_threads_stopped,
.. ..
}) => { }) => {
if let Some(thread_id) = thread_id { let all_threads_stopped = all_threads_stopped.unwrap_or_default();
if all_threads_stopped {
if let Ok(threads) = debugger.threads().await {
for thread in threads {
fetch_stack_trace(debugger, thread.id).await;
}
select_thread_id(&mut self.editor, thread_id.unwrap_or(0), false).await;
}
} else if let Some(thread_id) = thread_id {
debugger.thread_states.insert(thread_id, reason.clone()); // TODO: dap uses "type" || "reason" here debugger.thread_states.insert(thread_id, reason.clone()); // TODO: dap uses "type" || "reason" here
// whichever thread stops is made "current" (if no previously selected thread). // whichever thread stops is made "current" (if no previously selected thread).
@ -292,7 +303,7 @@ impl Application {
if let Some(text) = text { if let Some(text) = text {
status.push_str(&format!(" {}", text)); status.push_str(&format!(" {}", text));
} }
if all_threads_stopped.unwrap_or_default() { if all_threads_stopped {
status.push_str(" (all threads stopped)"); status.push_str(" (all threads stopped)");
} }

19
helix-term/src/commands/dap.rs
View file

@ -45,15 +45,7 @@ pub async fn select_thread_id(editor: &mut Editor, thread_id: isize, force: bool
} }
debugger.thread_id = Some(thread_id); debugger.thread_id = Some(thread_id);
fetch_stack_trace(debugger, thread_id).await;
// fetch stack trace
// TODO: handle requesting more total frames
let (frames, _) = match debugger.stack_trace(thread_id).await {
Ok(frames) => frames,
Err(_) => return,
};
debugger.stack_frames.insert(thread_id, frames);
debugger.active_frame = Some(0); // TODO: check how to determine this
let frame = debugger.stack_frames[&thread_id].get(0).cloned(); let frame = debugger.stack_frames[&thread_id].get(0).cloned();
if let Some(frame) = &frame { if let Some(frame) = &frame {
@ -61,6 +53,15 @@ pub async fn select_thread_id(editor: &mut Editor, thread_id: isize, force: bool
} }
} }
pub async fn fetch_stack_trace(debugger: &mut Client, thread_id: isize) {
let (frames, _) = match debugger.stack_trace(thread_id).await {
Ok(frames) => frames,
Err(_) => return,
};
debugger.stack_frames.insert(thread_id, frames);
debugger.active_frame = Some(0);
}
pub fn jump_to_stack_frame(editor: &mut Editor, frame: &helix_dap::StackFrame) { pub fn jump_to_stack_frame(editor: &mut Editor, frame: &helix_dap::StackFrame) {
let path = if let Some(helix_dap::Source { let path = if let Some(helix_dap::Source {
path: Some(ref path), path: Some(ref path),