@@ -30,9 +30,7 @@ fn thread_picker(
3030 dap_callback(
3131 cx.jobs,
3232 future,
33− move |editor: &mut Editor,
34− compositor: &mut Compositor,
35− response: dap::requests::ThreadsResponse| {
33+ move |editor, compositor, response: dap::requests::ThreadsResponse| {
3634 let threads = response.threads;
3735 if threads.len() == 1 {
3836 callback_fn(editor, &threads[0]);
@@ -250,11 +248,10 @@ pub fn dap_launch(cx: &mut Context) {
250248 let completions = template.completion.clone();
251249 let name = template.name.clone();
252250 let callback = Box::pin(async move {
253− let call: Callback =
254− Box::new(move |_editor: &mut Editor, compositor: &mut Compositor| {
255− let prompt = debug_parameter_prompt(completions, name, Vec::new());
256− compositor.push(Box::new(prompt));
257− });
251+ let call: Callback = Box::new(move |_editor, compositor| {
252+ let prompt = debug_parameter_prompt(completions, name, Vec::new());
253+ compositor.push(Box::new(prompt));
254+ });
258255 Ok(call)
259256 });
260257 cx.jobs.callback(callback);
@@ -309,11 +306,10 @@ fn debug_parameter_prompt(
309306 let config_name = config_name.clone();
310307 let params = params.clone();
311308 let callback = Box::pin(async move {
312− let call: Callback =
313− Box::new(move |_editor: &mut Editor, compositor: &mut Compositor| {
314− let prompt = debug_parameter_prompt(completions, config_name, params);
315− compositor.push(Box::new(prompt));
316− });
309+ let call: Callback = Box::new(move |_editor, compositor| {
310+ let prompt = debug_parameter_prompt(completions, config_name, params);
311+ compositor.push(Box::new(prompt));
312+ });
317313 Ok(call)
318314 });
319315 cx.jobs.callback(callback);
@@ -560,37 +556,35 @@ pub fn dap_edit_condition(cx: &mut Context) {
560556 None => return,
561557 };
562558 let callback = Box::pin(async move {
563− let call: Callback =
564− Box::new(move |_editor: &mut Editor, compositor: &mut Compositor| {
565− let mut prompt = Prompt::new(
566− "condition:".into(),
567− None,
568− ui::completers::none,
569− move |cx, input: &str, event: PromptEvent| {
570− if event != PromptEvent::Validate {
571− return;
572− }
573−
574− let breakpoints = &mut cx.editor.breakpoints.get_mut(&path).unwrap();
575− breakpoints[pos].condition = match input {
576− "" => None,
577− input => Some(input.to_owned()),
578− };
579−
580− let debugger = debugger!(cx.editor);
581−
582− if let Err(e) = breakpoints_changed(debugger, path.clone(), breakpoints)
583− {
584− cx.editor
585− .set_error(format!("Failed to set breakpoints: {}", e));
586− }
587− },
588− );
589− if let Some(condition) = breakpoint.condition {
590− prompt.insert_str(&condition)
591− }
592− compositor.push(Box::new(prompt));
593− });
559+ let call: Callback = Box::new(move |_editor, compositor| {
560+ let mut prompt = Prompt::new(
561+ "condition:".into(),
562+ None,
563+ ui::completers::none,
564+ move |cx, input: &str, event: PromptEvent| {
565+ if event != PromptEvent::Validate {
566+ return;
567+ }
568+
569+ let breakpoints = &mut cx.editor.breakpoints.get_mut(&path).unwrap();
570+ breakpoints[pos].condition = match input {
571+ "" => None,
572+ input => Some(input.to_owned()),
573+ };
574+
575+ let debugger = debugger!(cx.editor);
576+
577+ if let Err(e) = breakpoints_changed(debugger, path.clone(), breakpoints) {
578+ cx.editor
579+ .set_error(format!("Failed to set breakpoints: {}", e));
580+ }
581+ },
582+ );
583+ if let Some(condition) = breakpoint.condition {
584+ prompt.insert_str(&condition)
585+ }
586+ compositor.push(Box::new(prompt));
587+ });
594588 Ok(call)
595589 });
596590 cx.jobs.callback(callback);
@@ -604,36 +598,34 @@ pub fn dap_edit_log(cx: &mut Context) {
604598 None => return,
605599 };
606600 let callback = Box::pin(async move {
607− let call: Callback =
608− Box::new(move |_editor: &mut Editor, compositor: &mut Compositor| {
609− let mut prompt = Prompt::new(
610− "log-message:".into(),
611− None,
612− ui::completers::none,
613− move |cx, input: &str, event: PromptEvent| {
614− if event != PromptEvent::Validate {
615− return;
616− }
617−
618− let breakpoints = &mut cx.editor.breakpoints.get_mut(&path).unwrap();
619− breakpoints[pos].log_message = match input {
620− "" => None,
621− input => Some(input.to_owned()),
622− };
623−
624− let debugger = debugger!(cx.editor);
625− if let Err(e) = breakpoints_changed(debugger, path.clone(), breakpoints)
626− {
627− cx.editor
628− .set_error(format!("Failed to set breakpoints: {}", e));
629− }
630− },
631− );
632− if let Some(log_message) = breakpoint.log_message {
633− prompt.insert_str(&log_message);
634− }
635− compositor.push(Box::new(prompt));
636− });
601+ let call: Callback = Box::new(move |_editor, compositor| {
602+ let mut prompt = Prompt::new(
603+ "log-message:".into(),
604+ None,
605+ ui::completers::none,
606+ move |cx, input: &str, event: PromptEvent| {
607+ if event != PromptEvent::Validate {
608+ return;
609+ }
610+
611+ let breakpoints = &mut cx.editor.breakpoints.get_mut(&path).unwrap();
612+ breakpoints[pos].log_message = match input {
613+ "" => None,
614+ input => Some(input.to_owned()),
615+ };
616+
617+ let debugger = debugger!(cx.editor);
618+ if let Err(e) = breakpoints_changed(debugger, path.clone(), breakpoints) {
619+ cx.editor
620+ .set_error(format!("Failed to set breakpoints: {}", e));
621+ }
622+ },
623+ );
624+ if let Some(log_message) = breakpoint.log_message {
625+ prompt.insert_str(&log_message);
626+ }
627+ compositor.push(Box::new(prompt));
628+ });
637629 Ok(call)
638630 });
639631 cx.jobs.callback(callback);