dap: support arrays as arguments
This commit is contained in:
parent
d6e8a44d85
commit
6aa9838ea6
2 changed files with 30 additions and 7 deletions
|
@ -104,13 +104,20 @@ pub enum DebugConfigCompletion {
|
|||
Advanced(AdvancedCompletion),
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
|
||||
#[serde(untagged)]
|
||||
pub enum DebugArgumentValue {
|
||||
String(String),
|
||||
Array(Vec<String>),
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
|
||||
#[serde(rename_all = "kebab-case")]
|
||||
pub struct DebugTemplate {
|
||||
pub name: String,
|
||||
pub request: String,
|
||||
pub completion: Vec<DebugConfigCompletion>,
|
||||
pub args: HashMap<String, String>,
|
||||
pub args: HashMap<String, DebugArgumentValue>,
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
|
||||
|
|
|
@ -5,7 +5,10 @@ use crate::{
|
|||
job::Callback,
|
||||
ui::{FilePicker, Prompt, PromptEvent},
|
||||
};
|
||||
use helix_core::{syntax::DebugConfigCompletion, Selection};
|
||||
use helix_core::{
|
||||
syntax::{DebugArgumentValue, DebugConfigCompletion},
|
||||
Selection,
|
||||
};
|
||||
use helix_dap::{self as dap, Client, ThreadId};
|
||||
use helix_lsp::block_on;
|
||||
|
||||
|
@ -239,13 +242,26 @@ pub fn dap_start_impl(
|
|||
}
|
||||
}
|
||||
// For param #0 replace {0} in args
|
||||
value = value.replace(format!("{{{}}}", i).as_str(), ¶m);
|
||||
value = match value {
|
||||
DebugArgumentValue::String(v) => {
|
||||
DebugArgumentValue::String(v.replace(format!("{{{}}}", i).as_str(), ¶m))
|
||||
}
|
||||
DebugArgumentValue::Array(arr) => DebugArgumentValue::Array(
|
||||
arr.iter()
|
||||
.map(|v| v.replace(format!("{{{}}}", i).as_str(), ¶m))
|
||||
.collect(),
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
if let Ok(integer) = value.parse::<usize>() {
|
||||
args.insert(k, Value::Number(serde_json::Number::from(integer)));
|
||||
} else {
|
||||
args.insert(k, Value::String(value));
|
||||
if let DebugArgumentValue::String(string) = value {
|
||||
if let Ok(integer) = string.parse::<usize>() {
|
||||
args.insert(k, to_value(integer).unwrap());
|
||||
} else {
|
||||
args.insert(k, to_value(string).unwrap());
|
||||
}
|
||||
} else if let DebugArgumentValue::Array(arr) = value {
|
||||
args.insert(k, to_value(arr).unwrap());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue