on master help sign in
dap: Error implements Display so we can format with {}
commit4f2a01cc092d184fd0f841c6cfc237e1101521b4 authorBlaž Hrastnik <blaz@mxxn.io> dateSun 7 Nov 2021, 21:20 (5 years ago) parent2bd8a9b
1 file changed+16−18
helix-term/src/commands/dap.rs+16−18
helix-term/src/commands/dap.rs+16−18
@@ -104,7 +104,7 @@ fn thread_picker(cx: &mut Context, callback_fn: impl Fn(&mut Editor, &dap::Threa
104104 Ok(threads) => threads,
105105 Err(e) => {
106106 cx.editor
107− .set_error(format!("Failed to retrieve threads: {:?}", e));
107+ .set_error(format!("Failed to retrieve threads: {}", e));
108108 return;
109109 }
110110 };
@@ -203,14 +203,14 @@ pub fn dap_start_impl(
203203 let (mut debugger, events) = match result {
204204 Ok(r) => r,
205205 Err(e) => {
206− editor.set_error(format!("Failed to start debug session: {:?}", e));
206+ editor.set_error(format!("Failed to start debug session: {}", e));
207207 return;
208208 }
209209 };
210210
211211 let request = debugger.initialize(config.name.clone());
212212 if let Err(e) = block_on(request) {
213− editor.set_error(format!("Failed to initialize debug adapter: {:?}", e));
213+ editor.set_error(format!("Failed to initialize debug adapter: {}", e));
214214 return;
215215 }
216216
@@ -283,7 +283,7 @@ pub fn dap_start_impl(
283283 }
284284 };
285285 if let Err(e) = result {
286− editor.set_error(format!("Failed {} target: {:?}", start_config.request, e));
286+ editor.set_error(format!("Failed {} target: {}", start_config.request, e));
287287 return;
288288 }
289289
@@ -466,7 +466,7 @@ pub fn dap_toggle_breakpoint(cx: &mut Context) {
466466 }
467467 Err(e) => cx
468468 .editor
469− .set_error(format!("Failed to set breakpoints: {:?}", e)),
469+ .set_error(format!("Failed to set breakpoints: {}", e)),
470470 _ => {}
471471 };
472472}
@@ -480,7 +480,7 @@ pub fn dap_continue(cx: &mut Context) {
480480 if let Some(thread_id) = debugger.thread_id {
481481 let request = debugger.continue_thread(thread_id);
482482 if let Err(e) = block_on(request) {
483− cx.editor.set_error(format!("Failed to continue: {:?}", e));
483+ cx.editor.set_error(format!("Failed to continue: {}", e));
484484 return;
485485 }
486486 resume_application(debugger);
@@ -499,7 +499,7 @@ pub fn dap_pause(cx: &mut Context) {
499499 let request = debugger.pause(thread.id);
500500 // NOTE: we don't need to set active thread id here because DAP will emit a "stopped" event
501501 if let Err(e) = block_on(request) {
502− editor.set_error(format!("Failed to pause: {:?}", e));
502+ editor.set_error(format!("Failed to pause: {}", e));
503503 }
504504 })
505505}
@@ -513,7 +513,7 @@ pub fn dap_step_in(cx: &mut Context) {
513513 if let Some(thread_id) = debugger.thread_id {
514514 let request = debugger.step_in(thread_id);
515515 if let Err(e) = block_on(request) {
516− cx.editor.set_error(format!("Failed to continue: {:?}", e));
516+ cx.editor.set_error(format!("Failed to continue: {}", e));
517517 return;
518518 }
519519 resume_application(debugger);
@@ -532,7 +532,7 @@ pub fn dap_step_out(cx: &mut Context) {
532532 if let Some(thread_id) = debugger.thread_id {
533533 let request = debugger.step_out(thread_id);
534534 if let Err(e) = block_on(request) {
535− cx.editor.set_error(format!("Failed to continue: {:?}", e));
535+ cx.editor.set_error(format!("Failed to continue: {}", e));
536536 return;
537537 }
538538 resume_application(debugger);
@@ -551,7 +551,7 @@ pub fn dap_next(cx: &mut Context) {
551551 if let Some(thread_id) = debugger.thread_id {
552552 let request = debugger.next(thread_id);
553553 if let Err(e) = block_on(request) {
554− cx.editor.set_error(format!("Failed to continue: {:?}", e));
554+ cx.editor.set_error(format!("Failed to continue: {}", e));
555555 return;
556556 }
557557 resume_application(debugger);
@@ -585,8 +585,7 @@ pub fn dap_variables(cx: &mut Context) {
585585 let scopes = match block_on(debugger.scopes(frame_id)) {
586586 Ok(s) => s,
587587 Err(e) => {
588− cx.editor
589− .set_error(format!("Failed to get scopes: {:?}", e));
588+ cx.editor.set_error(format!("Failed to get scopes: {}", e));
590589 return;
591590 }
592591 };
@@ -620,8 +619,7 @@ pub fn dap_terminate(cx: &mut Context) {
620619
621620 let request = debugger.disconnect();
622621 if let Err(e) = block_on(request) {
623− cx.editor
624− .set_error(format!("Failed to disconnect: {:?}", e));
622+ cx.editor.set_error(format!("Failed to disconnect: {}", e));
625623 return;
626624 }
627625 cx.editor.debugger = None;
@@ -642,7 +640,7 @@ pub fn dap_enable_exceptions(cx: &mut Context) {
642640 debugger.set_exception_breakpoints(filters.iter().map(|f| f.filter.clone()).collect()),
643641 ) {
644642 cx.editor
645− .set_error(format!("Failed to set up exception breakpoints: {:?}", e));
643+ .set_error(format!("Failed to set up exception breakpoints: {}", e));
646644 }
647645}
648646
@@ -654,7 +652,7 @@ pub fn dap_disable_exceptions(cx: &mut Context) {
654652
655653 if let Err(e) = block_on(debugger.set_exception_breakpoints(vec![])) {
656654 cx.editor
657− .set_error(format!("Failed to set up exception breakpoints: {:?}", e));
655+ .set_error(format!("Failed to set up exception breakpoints: {}", e));
658656 }
659657}
660658
@@ -723,7 +721,7 @@ pub fn dap_edit_condition(cx: &mut Context) {
723721 debugger.set_breakpoints(path.clone(), breakpoints.clone());
724722 if let Err(e) = block_on(request) {
725723 cx.editor
726− .set_status(format!("Failed to set breakpoints: {:?}", e))
724+ .set_status(format!("Failed to set breakpoints: {}", e))
727725 }
728726 }
729727 },
@@ -802,7 +800,7 @@ pub fn dap_edit_log(cx: &mut Context) {
802800 debugger.set_breakpoints(path.clone(), breakpoints.clone());
803801 if let Err(e) = block_on(request) {
804802 cx.editor
805− .set_status(format!("Failed to set breakpoints: {:?}", e))
803+ .set_status(format!("Failed to set breakpoints: {}", e))
806804 }
807805 }
808806 },