aboutsummaryrefslogtreecommitdiff
path: root/helix-term
diff options
context:
space:
mode:
authorDmitry Sharshakov2021-08-29 11:51:47 +0000
committerDmitry Sharshakov2021-08-29 11:51:47 +0000
commitb42631942b74b2f5ac5c955343861518c38282e8 (patch)
tree4e65d987e3cca61c59bf8a6141738c1915c36939 /helix-term
parentf53d8411cbda6119bcd34d5936fc23c1365bafef (diff)
Defaults in completions, better schema
Diffstat (limited to 'helix-term')
-rw-r--r--helix-term/src/commands.rs8
-rw-r--r--helix-term/src/ui/editor.rs46
2 files changed, 37 insertions, 17 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index af6acb8c..eea73e47 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4528,7 +4528,13 @@ pub fn dap_start_impl(
let result = match socket {
Some(socket) => block_on(Client::tcp(socket, 0)),
- None => block_on(Client::process(config.clone(), 0)),
+ None => block_on(Client::process(
+ config.transport.clone(),
+ config.command.clone(),
+ config.args.clone(),
+ config.port_arg.clone(),
+ 0,
+ )),
};
let (mut debugger, events) = match result {
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 1f20619d..bb183b3a 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -11,7 +11,7 @@ use helix_core::{
coords_at_pos,
graphemes::{ensure_grapheme_boundary_next, next_grapheme_boundary, prev_grapheme_boundary},
movement::Direction,
- syntax::{self, HighlightEvent},
+ syntax::{self, DebugConfigCompletion, HighlightEvent},
unicode::segmentation::UnicodeSegmentation,
unicode::width::UnicodeWidthStr,
LineEnding, Position, Range, Selection,
@@ -710,28 +710,38 @@ impl EditorView {
}
fn debug_parameter_prompt(
- completions: Vec<String>,
+ completions: Vec<DebugConfigCompletion>,
config_name: String,
mut params: Vec<String>,
) -> Prompt {
let i = params.len();
- let field_type = completions.get(i).map(|x| x.as_str());
+ let completion = completions.get(i).unwrap();
+ let field_type = if let DebugConfigCompletion::Advanced(cfg) = completion {
+ cfg.completion.clone().unwrap_or_else(|| "".to_owned())
+ } else {
+ "".to_owned()
+ };
+ let name = match completion {
+ DebugConfigCompletion::Advanced(cfg) => {
+ cfg.name.clone().unwrap_or_else(|| field_type.to_owned())
+ }
+ DebugConfigCompletion::Named(name) => name.clone(),
+ };
+ let default_val = match completion {
+ DebugConfigCompletion::Advanced(cfg) => {
+ cfg.default.clone().unwrap_or_else(|| "".to_owned())
+ }
+ _ => "".to_owned(),
+ };
let noop = |_input: &str| Vec::new();
- let completer = match field_type {
- Some(field_type) => {
- if field_type.starts_with("filename") {
- super::completers::filename
- } else if field_type.starts_with("directory") {
- super::completers::directory
- } else {
- noop
- }
- }
- None => noop,
+ let completer = match &field_type[..] {
+ "filename" => super::completers::filename,
+ "directory" => super::completers::directory,
+ _ => noop,
};
Prompt::new(
- format!("{}: ", field_type.unwrap_or("arg")),
+ format!("{}: ", name),
None,
completer,
move |cx: &mut crate::compositor::Context, input: &str, event: PromptEvent| {
@@ -739,7 +749,11 @@ impl EditorView {
return;
}
- params.push(input.to_owned());
+ let mut value = input.to_owned();
+ if value.is_empty() {
+ value = default_val.clone();
+ }
+ params.push(value);
if params.len() < completions.len() {
let completions = completions.clone();