TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

dap: Consistently rename type as ty

Browse source
This commit is contained in:
Blaž Hrastnik 2021-11-07 21:18:53 +09:00
parent 31b431bfdd
commit 2bd8a9b39d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
helix-dap/src/types.rs
View file

@ -26,7 +26,7 @@ pub struct ColumnDescriptor {
pub label: String, pub label: String,
pub format: Option<String>, pub format: Option<String>,
#[serde(rename = "type")] #[serde(rename = "type")]
pub col_type: Option<String>, pub ty: Option<String>,
pub width: Option<usize>, pub width: Option<usize>,
} }
@ -200,7 +200,7 @@ pub struct Variable {
pub name: String, pub name: String,
pub value: String, pub value: String,
#[serde(rename = "type")] #[serde(rename = "type")]
pub data_type: Option<String>, pub ty: Option<String>,
pub presentation_hint: Option<VariablePresentationHint>, pub presentation_hint: Option<VariablePresentationHint>,
pub evaluate_name: Option<String>, pub evaluate_name: Option<String>,
pub variables_reference: usize, pub variables_reference: usize,
@ -502,7 +502,7 @@ pub mod requests {
pub struct EvaluateResponse { pub struct EvaluateResponse {
pub result: String, pub result: String,
#[serde(rename = "type")] #[serde(rename = "type")]
pub data_type: Option<String>, pub ty: Option<String>,
pub presentation_hint: Option<VariablePresentationHint>, pub presentation_hint: Option<VariablePresentationHint>,
pub variables_reference: usize, pub variables_reference: usize,
pub named_variables: Option<usize>, pub named_variables: Option<usize>,

2
helix-term/src/commands/dap.rs
View file

@ -598,7 +598,7 @@ pub fn dap_variables(cx: &mut Context) {
if let Ok(vars) = response { if let Ok(vars) = response {
variables.reserve(vars.len()); variables.reserve(vars.len());
for var in vars { for var in vars {
let prefix = match var.data_type { let prefix = match var.ty {
Some(data_type) => format!("{} ", data_type), Some(data_type) => format!("{} ", data_type),
None => "".to_owned(), None => "".to_owned(),
}; };