Mirrors
/
helix
mirror of https://github.com/helix-editor/helix
1
1
Fork 1
Code Issues Packages Projects Releases Wiki Activity

dap: Error implements Display so we can format with {}

Browse Source
pull/574/head
Blaž Hrastnik 3 years ago
parent 2bd8a9b39d
commit 4f2a01cc09
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File

34
helix-term/src/commands/dap.rs
Unescape Escape View File

@ -104,7 +104,7 @@ fn thread_picker(cx: &mut Context, callback_fn: impl Fn(&mut Editor, &dap::Threa
Ok(threads) => threads, Ok(threads) => threads,
Err(e) => { Err(e) => {
cx.editor cx.editor
.set_error(format!("Failed to retrieve threads: {:?}", e)); .set_error(format!("Failed to retrieve threads: {}", e));
return; return;
} }
}; };
@ -203,14 +203,14 @@ pub fn dap_start_impl(
let (mut debugger, events) = match result { let (mut debugger, events) = match result {
Ok(r) => r, Ok(r) => r,
Err(e) => { Err(e) => {
editor.set_error(format!("Failed to start debug session: {:?}", e)); editor.set_error(format!("Failed to start debug session: {}", e));
return; return;
} }
}; };
let request = debugger.initialize(config.name.clone()); let request = debugger.initialize(config.name.clone());
if let Err(e) = block_on(request) { if let Err(e) = block_on(request) {
editor.set_error(format!("Failed to initialize debug adapter: {:?}", e)); editor.set_error(format!("Failed to initialize debug adapter: {}", e));
return; return;
} }
@ -283,7 +283,7 @@ pub fn dap_start_impl(
} }
}; };
if let Err(e) = result { if let Err(e) = result {
editor.set_error(format!("Failed {} target: {:?}", start_config.request, e)); editor.set_error(format!("Failed {} target: {}", start_config.request, e));
return; return;
} }
@ -466,7 +466,7 @@ pub fn dap_toggle_breakpoint(cx: &mut Context) {
} }
Err(e) => cx Err(e) => cx
.editor .editor
.set_error(format!("Failed to set breakpoints: {:?}", e)), .set_error(format!("Failed to set breakpoints: {}", e)),
_ => {} _ => {}
}; };
} }
@ -480,7 +480,7 @@ pub fn dap_continue(cx: &mut Context) {
if let Some(thread_id) = debugger.thread_id { if let Some(thread_id) = debugger.thread_id {
let request = debugger.continue_thread(thread_id); let request = debugger.continue_thread(thread_id);
if let Err(e) = block_on(request) { if let Err(e) = block_on(request) {
cx.editor.set_error(format!("Failed to continue: {:?}", e)); cx.editor.set_error(format!("Failed to continue: {}", e));
return; return;
} }
resume_application(debugger); resume_application(debugger);
@ -499,7 +499,7 @@ pub fn dap_pause(cx: &mut Context) {
let request = debugger.pause(thread.id); let request = debugger.pause(thread.id);
// NOTE: we don't need to set active thread id here because DAP will emit a "stopped" event // NOTE: we don't need to set active thread id here because DAP will emit a "stopped" event
if let Err(e) = block_on(request) { if let Err(e) = block_on(request) {
editor.set_error(format!("Failed to pause: {:?}", e)); editor.set_error(format!("Failed to pause: {}", e));
} }
}) })
} }
@ -513,7 +513,7 @@ pub fn dap_step_in(cx: &mut Context) {
if let Some(thread_id) = debugger.thread_id { if let Some(thread_id) = debugger.thread_id {
let request = debugger.step_in(thread_id); let request = debugger.step_in(thread_id);
if let Err(e) = block_on(request) { if let Err(e) = block_on(request) {
cx.editor.set_error(format!("Failed to continue: {:?}", e)); cx.editor.set_error(format!("Failed to continue: {}", e));
return; return;
} }
resume_application(debugger); resume_application(debugger);
@ -532,7 +532,7 @@ pub fn dap_step_out(cx: &mut Context) {
if let Some(thread_id) = debugger.thread_id { if let Some(thread_id) = debugger.thread_id {
let request = debugger.step_out(thread_id); let request = debugger.step_out(thread_id);
if let Err(e) = block_on(request) { if let Err(e) = block_on(request) {
cx.editor.set_error(format!("Failed to continue: {:?}", e)); cx.editor.set_error(format!("Failed to continue: {}", e));
return; return;
} }
resume_application(debugger); resume_application(debugger);
@ -551,7 +551,7 @@ pub fn dap_next(cx: &mut Context) {
if let Some(thread_id) = debugger.thread_id { if let Some(thread_id) = debugger.thread_id {
let request = debugger.next(thread_id); let request = debugger.next(thread_id);
if let Err(e) = block_on(request) { if let Err(e) = block_on(request) {
cx.editor.set_error(format!("Failed to continue: {:?}", e)); cx.editor.set_error(format!("Failed to continue: {}", e));
return; return;
} }
resume_application(debugger); resume_application(debugger);
@ -585,8 +585,7 @@ pub fn dap_variables(cx: &mut Context) {
let scopes = match block_on(debugger.scopes(frame_id)) { let scopes = match block_on(debugger.scopes(frame_id)) {
Ok(s) => s, Ok(s) => s,
Err(e) => { Err(e) => {
cx.editor cx.editor.set_error(format!("Failed to get scopes: {}", e));
.set_error(format!("Failed to get scopes: {:?}", e));
return; return;
} }
}; };
@ -620,8 +619,7 @@ pub fn dap_terminate(cx: &mut Context) {
let request = debugger.disconnect(); let request = debugger.disconnect();
if let Err(e) = block_on(request) { if let Err(e) = block_on(request) {
cx.editor cx.editor.set_error(format!("Failed to disconnect: {}", e));
.set_error(format!("Failed to disconnect: {:?}", e));
return; return;
} }
cx.editor.debugger = None; cx.editor.debugger = None;
@ -642,7 +640,7 @@ pub fn dap_enable_exceptions(cx: &mut Context) {
debugger.set_exception_breakpoints(filters.iter().map(|f| f.filter.clone()).collect()), debugger.set_exception_breakpoints(filters.iter().map(|f| f.filter.clone()).collect()),
) { ) {
cx.editor cx.editor
.set_error(format!("Failed to set up exception breakpoints: {:?}", e)); .set_error(format!("Failed to set up exception breakpoints: {}", e));
} }
} }
@ -654,7 +652,7 @@ pub fn dap_disable_exceptions(cx: &mut Context) {
if let Err(e) = block_on(debugger.set_exception_breakpoints(vec![])) { if let Err(e) = block_on(debugger.set_exception_breakpoints(vec![])) {
cx.editor cx.editor
.set_error(format!("Failed to set up exception breakpoints: {:?}", e)); .set_error(format!("Failed to set up exception breakpoints: {}", e));
} }
} }
@ -723,7 +721,7 @@ pub fn dap_edit_condition(cx: &mut Context) {
debugger.set_breakpoints(path.clone(), breakpoints.clone()); debugger.set_breakpoints(path.clone(), breakpoints.clone());
if let Err(e) = block_on(request) { if let Err(e) = block_on(request) {
cx.editor cx.editor
.set_status(format!("Failed to set breakpoints: {:?}", e)) .set_status(format!("Failed to set breakpoints: {}", e))
} }
} }
}, },
@ -802,7 +800,7 @@ pub fn dap_edit_log(cx: &mut Context) {
debugger.set_breakpoints(path.clone(), breakpoints.clone()); debugger.set_breakpoints(path.clone(), breakpoints.clone());
if let Err(e) = block_on(request) { if let Err(e) = block_on(request) {
cx.editor cx.editor
.set_status(format!("Failed to set breakpoints: {:?}", e)) .set_status(format!("Failed to set breakpoints: {}", e))
} }
} }
}, },

Write Preview
Loading…
Cancel
Save