@@ -1,7 +1,6 @@
11use crate::{
22 commands,
3− compositor::{Component, Compositor, Context, EventResult},
4− job::Callback,
3+ compositor::{Component, Context, EventResult},
54 key,
65 keymap::{KeymapResult, KeymapResultKind, Keymaps},
76 ui::{Completion, ProgressSpinners},
@@ -11,7 +10,7 @@ use helix_core::{
1110 coords_at_pos,
1211 graphemes::{ensure_grapheme_boundary_next, next_grapheme_boundary, prev_grapheme_boundary},
1312 movement::Direction,
14− syntax::{self, DebugConfigCompletion, HighlightEvent},
13+ syntax::{self, HighlightEvent},
1514 unicode::segmentation::UnicodeSegmentation,
1615 unicode::width::UnicodeWidthStr,
1716 LineEnding, Position, Range, Selection,
@@ -31,8 +30,6 @@ use std::{borrow::Cow, collections::HashMap, path::PathBuf};
3130use crossterm::event::{Event, MouseButton, MouseEvent, MouseEventKind};
3231use tui::buffer::Buffer as Surface;
3332
34−use super::{Prompt, PromptEvent};
35−
3633pub struct EditorView {
3734 keymaps: Keymaps,
3835 on_next_key: Option<Box<dyn FnOnce(&mut commands::Context, KeyEvent)>>,
@@ -815,79 +812,6 @@ impl EditorView {
815812 );
816813 }
817814
818− fn debug_parameter_prompt(
819− completions: Vec<DebugConfigCompletion>,
820− config_name: String,
821− mut params: Vec<String>,
822− ) -> Prompt {
823− let i = params.len();
824− let completion = completions.get(i).unwrap();
825− let field_type = if let DebugConfigCompletion::Advanced(cfg) = completion {
826− cfg.completion.clone().unwrap_or_else(|| "".to_owned())
827− } else {
828− "".to_owned()
829− };
830− let name = match completion {
831− DebugConfigCompletion::Advanced(cfg) => {
832− cfg.name.clone().unwrap_or_else(|| field_type.to_owned())
833− }
834− DebugConfigCompletion::Named(name) => name.clone(),
835− };
836− let default_val = match completion {
837− DebugConfigCompletion::Advanced(cfg) => {
838− cfg.default.clone().unwrap_or_else(|| "".to_owned())
839− }
840− _ => "".to_owned(),
841− };
842−
843− let noop = |_input: &str| Vec::new();
844− let completer = match &field_type[..] {
845− "filename" => super::completers::filename,
846− "directory" => super::completers::directory,
847− _ => noop,
848− };
849− Prompt::new(
850− format!("{}: ", name).into(),
851− None,
852− completer,
853− move |cx: &mut crate::compositor::Context, input: &str, event: PromptEvent| {
854− if event != PromptEvent::Validate {
855− return;
856− }
857−
858− let mut value = input.to_owned();
859− if value.is_empty() {
860− value = default_val.clone();
861− }
862− params.push(value);
863−
864− if params.len() < completions.len() {
865− let completions = completions.clone();
866− let config_name = config_name.clone();
867− let params = params.clone();
868− let callback = Box::pin(async move {
869− let call: Callback =
870− Box::new(move |_editor: &mut Editor, compositor: &mut Compositor| {
871− let prompt =
872− Self::debug_parameter_prompt(completions, config_name, params);
873− compositor.push(Box::new(prompt));
874− });
875− Ok(call)
876− });
877− cx.jobs.callback(callback);
878− } else {
879− commands::dap_start_impl(
880− cx.editor,
881− Some(&config_name),
882− None,
883− Some(params.iter().map(|x| x.as_str()).collect()),
884− );
885− }
886− },
887− None,
888− )
889− }
890−
891815 /// Handle events by looking them up in `self.keymaps`. Returns None
892816 /// if event was handled (a command was executed or a subkeymap was
893817 /// activated). Only KeymapResultKind::{NotFound, Cancelled} is returned
@@ -898,14 +822,6 @@ impl EditorView {
898822 cxt: &mut commands::Context,
899823 event: KeyEvent,
900824 ) -> Option<KeymapResult> {
901− if !cxt.editor.debug_config_completions.is_empty() {
902− let completions = std::mem::take(&mut cxt.editor.debug_config_completions);
903− // TODO name
904− let prompt = Self::debug_parameter_prompt(completions, "test".to_string(), Vec::new());
905− cxt.push_layer(Box::new(prompt));
906− return None;
907− }
908−
909825 let key_result = self.keymaps.get_mut(&mode).unwrap().get(event);
910826 self.autoinfo = key_result.sticky.map(|node| node.infobox());
911827