git.iko.soy/helix
on master help sign in
dap: Error implements Display so we can format with {}
4f2a01cBlaž Hrastnik
helix-term/src/commands/dap.rs+16−18
compare with master
unifiedsplit
@@ -104,7 +104,7 @@ fn thread_picker(cx: &mut Context, callback_fn: impl Fn(&mut Editor, &dap::Threa
104 Ok(threads) => threads,
104 Ok(threads) => threads,
105 Err(e) => {
105 Err(e) => {
106 cx.editor
106 cx.editor
107− .set_error(format!("Failed to retrieve threads: {:?}", e));
107+ .set_error(format!("Failed to retrieve threads: {}", e));
108 return;
108 return;
109 }
109 }
110 };
110 };
@@ -203,14 +203,14 @@ pub fn dap_start_impl(
203 let (mut debugger, events) = match result {
203 let (mut debugger, events) = match result {
204 Ok(r) => r,
204 Ok(r) => r,
205 Err(e) => {
205 Err(e) => {
206− editor.set_error(format!("Failed to start debug session: {:?}", e));
206+ editor.set_error(format!("Failed to start debug session: {}", e));
207 return;
207 return;
208 }
208 }
209 };
209 };
210
210
211 let request = debugger.initialize(config.name.clone());
211 let request = debugger.initialize(config.name.clone());
212 if let Err(e) = block_on(request) {
212 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));
214 return;
214 return;
215 }
215 }
216
216
@@ -283,7 +283,7 @@ pub fn dap_start_impl(
283 }
283 }
284 };
284 };
285 if let Err(e) = result {
285 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));
287 return;
287 return;
288 }
288 }
289
289
@@ -466,7 +466,7 @@ pub fn dap_toggle_breakpoint(cx: &mut Context) {
466 }
466 }
467 Err(e) => cx
467 Err(e) => cx
468 .editor
468 .editor
469− .set_error(format!("Failed to set breakpoints: {:?}", e)),
469+ .set_error(format!("Failed to set breakpoints: {}", e)),
470 _ => {}
470 _ => {}
471 };
471 };
472}
472}
@@ -480,7 +480,7 @@ pub fn dap_continue(cx: &mut Context) {
480 if let Some(thread_id) = debugger.thread_id {
480 if let Some(thread_id) = debugger.thread_id {
481 let request = debugger.continue_thread(thread_id);
481 let request = debugger.continue_thread(thread_id);
482 if let Err(e) = block_on(request) {
482 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));
484 return;
484 return;
485 }
485 }
486 resume_application(debugger);
486 resume_application(debugger);
@@ -499,7 +499,7 @@ pub fn dap_pause(cx: &mut Context) {
499 let request = debugger.pause(thread.id);
499 let request = debugger.pause(thread.id);
500 // NOTE: we don't need to set active thread id here because DAP will emit a "stopped" event
500 // NOTE: we don't need to set active thread id here because DAP will emit a "stopped" event
501 if let Err(e) = block_on(request) {
501 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));
503 }
503 }
504 })
504 })
505}
505}
@@ -513,7 +513,7 @@ pub fn dap_step_in(cx: &mut Context) {
513 if let Some(thread_id) = debugger.thread_id {
513 if let Some(thread_id) = debugger.thread_id {
514 let request = debugger.step_in(thread_id);
514 let request = debugger.step_in(thread_id);
515 if let Err(e) = block_on(request) {
515 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));
517 return;
517 return;
518 }
518 }
519 resume_application(debugger);
519 resume_application(debugger);
@@ -532,7 +532,7 @@ pub fn dap_step_out(cx: &mut Context) {
532 if let Some(thread_id) = debugger.thread_id {
532 if let Some(thread_id) = debugger.thread_id {
533 let request = debugger.step_out(thread_id);
533 let request = debugger.step_out(thread_id);
534 if let Err(e) = block_on(request) {
534 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));
536 return;
536 return;
537 }
537 }
538 resume_application(debugger);
538 resume_application(debugger);
@@ -551,7 +551,7 @@ pub fn dap_next(cx: &mut Context) {
551 if let Some(thread_id) = debugger.thread_id {
551 if let Some(thread_id) = debugger.thread_id {
552 let request = debugger.next(thread_id);
552 let request = debugger.next(thread_id);
553 if let Err(e) = block_on(request) {
553 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));
555 return;
555 return;
556 }
556 }
557 resume_application(debugger);
557 resume_application(debugger);
@@ -585,8 +585,7 @@ pub fn dap_variables(cx: &mut Context) {
585 let scopes = match block_on(debugger.scopes(frame_id)) {
585 let scopes = match block_on(debugger.scopes(frame_id)) {
586 Ok(s) => s,
586 Ok(s) => s,
587 Err(e) => {
587 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));
590 return;
589 return;
591 }
590 }
592 };
591 };
@@ -620,8 +619,7 @@ pub fn dap_terminate(cx: &mut Context) {
620
619
621 let request = debugger.disconnect();
620 let request = debugger.disconnect();
622 if let Err(e) = block_on(request) {
621 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));
625 return;
623 return;
626 }
624 }
627 cx.editor.debugger = None;
625 cx.editor.debugger = None;
@@ -642,7 +640,7 @@ pub fn dap_enable_exceptions(cx: &mut Context) {
642 debugger.set_exception_breakpoints(filters.iter().map(|f| f.filter.clone()).collect()),
640 debugger.set_exception_breakpoints(filters.iter().map(|f| f.filter.clone()).collect()),
643 ) {
641 ) {
644 cx.editor
642 cx.editor
645− .set_error(format!("Failed to set up exception breakpoints: {:?}", e));
643+ .set_error(format!("Failed to set up exception breakpoints: {}", e));
646 }
644 }
647}
645}
648
646
@@ -654,7 +652,7 @@ pub fn dap_disable_exceptions(cx: &mut Context) {
654
652
655 if let Err(e) = block_on(debugger.set_exception_breakpoints(vec![])) {
653 if let Err(e) = block_on(debugger.set_exception_breakpoints(vec![])) {
656 cx.editor
654 cx.editor
657− .set_error(format!("Failed to set up exception breakpoints: {:?}", e));
655+ .set_error(format!("Failed to set up exception breakpoints: {}", e));
658 }
656 }
659}
657}
660
658
@@ -723,7 +721,7 @@ pub fn dap_edit_condition(cx: &mut Context) {
723 debugger.set_breakpoints(path.clone(), breakpoints.clone());
721 debugger.set_breakpoints(path.clone(), breakpoints.clone());
724 if let Err(e) = block_on(request) {
722 if let Err(e) = block_on(request) {
725 cx.editor
723 cx.editor
726− .set_status(format!("Failed to set breakpoints: {:?}", e))
724+ .set_status(format!("Failed to set breakpoints: {}", e))
727 }
725 }
728 }
726 }
729 },
727 },
@@ -802,7 +800,7 @@ pub fn dap_edit_log(cx: &mut Context) {
802 debugger.set_breakpoints(path.clone(), breakpoints.clone());
800 debugger.set_breakpoints(path.clone(), breakpoints.clone());
803 if let Err(e) = block_on(request) {
801 if let Err(e) = block_on(request) {
804 cx.editor
802 cx.editor
805− .set_status(format!("Failed to set breakpoints: {:?}", e))
803+ .set_status(format!("Failed to set breakpoints: {}", e))
806 }
804 }
807 }
805 }
808 },
806 },