Skip to content

Commit

Permalink
fix(dap): validate key and index exist when requesting vars (helix-ed…
Browse files Browse the repository at this point in the history
…itor#5628)

Check if the stack frames contain the thread id and the frame before
trying to get the frame id. If case any of the two fails to be
found, provide the user with messages to inform them of the issue and
gracefully return.

Closes: helix-editor#5625

Signed-off-by: Filip Dutescu <[email protected]>
  • Loading branch information
filipdutescu authored and wes-adams committed Jul 3, 2023
1 parent 1b846fb commit 2263537
Showing 1 changed file with 20 additions and 3 deletions.
23 changes: 20 additions & 3 deletions helix-term/src/commands/dap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -475,19 +475,36 @@ pub fn dap_variables(cx: &mut Context) {

if debugger.thread_id.is_none() {
cx.editor
.set_status("Cannot access variables while target is running");
.set_status("Cannot access variables while target is running.");
return;
}
let (frame, thread_id) = match (debugger.active_frame, debugger.thread_id) {
(Some(frame), Some(thread_id)) => (frame, thread_id),
_ => {
cx.editor
.set_status("Cannot find current stack frame to access variables");
.set_status("Cannot find current stack frame to access variables.");
return;
}
};

let frame_id = debugger.stack_frames[&thread_id][frame].id;
let thread_frame = match debugger.stack_frames.get(&thread_id) {
Some(thread_frame) => thread_frame,
None => {
cx.editor
.set_error("Failed to get stack frame for thread: {thread_id}");
return;
}
};
let stack_frame = match thread_frame.get(frame) {
Some(stack_frame) => stack_frame,
None => {
cx.editor
.set_error("Failed to get stack frame for thread {thread_id} and frame {frame}.");
return;
}
};

let frame_id = stack_frame.id;
let scopes = match block_on(debugger.scopes(frame_id)) {
Ok(s) => s,
Err(e) => {
Expand Down

0 comments on commit 2263537

Please sign in to comment.