@@ -21,6 +21,16 @@ use std::path::PathBuf;
2121
2222use anyhow::{anyhow, bail};
2323
24+#[macro_export]
25+macro_rules! debugger {
26+ ($editor:expr) => {{
27+ match &mut $editor.debugger {
28+ Some(debugger) => debugger,
29+ None => return,
30+ }
31+ }};
32+}
33+
2434// general utils:
2535pub fn dap_pos_to_pos(doc: &helix_core::Rope, line: usize, column: usize) -> Option<usize> {
2636 // 1-indexing to 0 indexing
@@ -42,10 +52,7 @@ pub fn resume_application(debugger: &mut Client) {
4252}
4353
4454pub async fn select_thread_id(editor: &mut Editor, thread_id: ThreadId, force: bool) {
45− let debugger = match &mut editor.debugger {
46− Some(debugger) => debugger,
47− None => return,
48− };
55+ let debugger = debugger!(editor);
4956
5057 if !force && debugger.thread_id.is_some() {
5158 return;
@@ -103,10 +110,7 @@ fn thread_picker(
103110 cx: &mut Context,
104111 callback_fn: impl Fn(&mut Editor, &dap::Thread) + Send + 'static,
105112) {
106− let debugger = match &mut cx.editor.debugger {
107− Some(debugger) => debugger,
108− None => return,
109− };
113+ let debugger = debugger!(cx.editor);
110114
111115 let future = debugger.threads();
112116 dap_callback(
@@ -505,10 +509,7 @@ pub fn dap_toggle_breakpoint_impl(cx: &mut Context, path: PathBuf, line: usize)
505509 });
506510 }
507511
508− let debugger = match &mut cx.editor.debugger {
509− Some(debugger) => debugger,
510− None => return,
511− };
512+ let debugger = debugger!(cx.editor);
512513
513514 if let Err(e) = breakpoints_changed(debugger, path, breakpoints) {
514515 cx.editor
@@ -517,10 +518,7 @@ pub fn dap_toggle_breakpoint_impl(cx: &mut Context, path: PathBuf, line: usize)
517518}
518519
519520pub fn dap_continue(cx: &mut Context) {
520− let debugger = match &mut cx.editor.debugger {
521− Some(debugger) => debugger,
522− None => return,
523− };
521+ let debugger = debugger!(cx.editor);
524522
525523 if let Some(thread_id) = debugger.thread_id {
526524 let request = debugger.continue_thread(thread_id);
@@ -550,10 +548,7 @@ pub fn dap_pause(cx: &mut Context) {
550548}
551549
552550pub fn dap_step_in(cx: &mut Context) {
553− let debugger = match &mut cx.editor.debugger {
554− Some(debugger) => debugger,
555− None => return,
556− };
551+ let debugger = debugger!(cx.editor);
557552
558553 if let Some(thread_id) = debugger.thread_id {
559554 let request = debugger.step_in(thread_id);
@@ -569,10 +564,7 @@ pub fn dap_step_in(cx: &mut Context) {
569564}
570565
571566pub fn dap_step_out(cx: &mut Context) {
572− let debugger = match &mut cx.editor.debugger {
573− Some(debugger) => debugger,
574− None => return,
575− };
567+ let debugger = debugger!(cx.editor);
576568
577569 if let Some(thread_id) = debugger.thread_id {
578570 let request = debugger.step_out(thread_id);
@@ -588,10 +580,7 @@ pub fn dap_step_out(cx: &mut Context) {
588580}
589581
590582pub fn dap_next(cx: &mut Context) {
591− let debugger = match &mut cx.editor.debugger {
592− Some(debugger) => debugger,
593− None => return,
594− };
583+ let debugger = debugger!(cx.editor);
595584
596585 if let Some(thread_id) = debugger.thread_id {
597586 let request = debugger.next(thread_id);
@@ -607,10 +596,7 @@ pub fn dap_next(cx: &mut Context) {
607596}
608597
609598pub fn dap_variables(cx: &mut Context) {
610− let debugger = match &mut cx.editor.debugger {
611− Some(debugger) => debugger,
612− None => return,
613− };
599+ let debugger = debugger!(cx.editor);
614600
615601 if debugger.thread_id.is_none() {
616602 cx.editor
@@ -657,10 +643,7 @@ pub fn dap_variables(cx: &mut Context) {
657643}
658644
659645pub fn dap_terminate(cx: &mut Context) {
660− let debugger = match &mut cx.editor.debugger {
661− Some(debugger) => debugger,
662− None => return,
663− };
646+ let debugger = debugger!(cx.editor);
664647
665648 let request = debugger.disconnect();
666649 if let Err(e) = block_on(request) {
@@ -671,10 +654,7 @@ pub fn dap_terminate(cx: &mut Context) {
671654}
672655
673656pub fn dap_enable_exceptions(cx: &mut Context) {
674− let debugger = match &mut cx.editor.debugger {
675− Some(debugger) => debugger,
676− None => return,
677− };
657+ let debugger = debugger!(cx.editor);
678658
679659 let filters = match &debugger.capabilities().exception_breakpoint_filters {
680660 Some(filters) => filters.iter().map(|f| f.filter.clone()).collect(),
@@ -688,10 +668,7 @@ pub fn dap_enable_exceptions(cx: &mut Context) {
688668}
689669
690670pub fn dap_disable_exceptions(cx: &mut Context) {
691− let debugger = match &mut cx.editor.debugger {
692− Some(debugger) => debugger,
693− None => return,
694− };
671+ let debugger = debugger!(cx.editor);
695672
696673 if let Err(e) = block_on(debugger.set_exception_breakpoints(vec![])) {
697674 cx.editor
@@ -724,10 +701,7 @@ pub fn dap_edit_condition(cx: &mut Context) {
724701 input => Some(input.to_owned()),
725702 };
726703
727− let debugger = match &mut cx.editor.debugger {
728− Some(debugger) => debugger,
729− None => return,
730− };
704+ let debugger = debugger!(cx.editor);
731705
732706 if let Err(e) = breakpoints_changed(debugger, path.clone(), breakpoints)
733707 {
@@ -771,10 +745,7 @@ pub fn dap_edit_log(cx: &mut Context) {
771745 input => Some(input.to_owned()),
772746 };
773747
774− let debugger = match &mut cx.editor.debugger {
775− Some(debugger) => debugger,
776− None => return,
777− };
748+ let debugger = debugger!(cx.editor);
778749 if let Err(e) = breakpoints_changed(debugger, path.clone(), breakpoints)
779750 {
780751 cx.editor
@@ -799,10 +770,7 @@ pub fn dap_switch_thread(cx: &mut Context) {
799770 })
800771}
801772pub fn dap_switch_stack_frame(cx: &mut Context) {
802− let debugger = match &mut cx.editor.debugger {
803− Some(debugger) => debugger,
804− None => return,
805− };
773+ let debugger = debugger!(cx.editor);
806774
807775 let thread_id = match debugger.thread_id {
808776 Some(thread_id) => thread_id,