2bd8a9b · helix · git.iko.soy

dap: Consistently rename type as ty

commit2bd8a9b39df795f68e74ccd48fcb2b2b50fc9313 authorBlaž Hrastnik <blaz@mxxn.io> dateSun 7 Nov 2021, 21:18 (5 years ago) parent31b431b

2 files changed+4−4

unifiedsplit

helix-dap/src/types.rs+3−3

@@ -26,7 +26,7 @@ pub struct ColumnDescriptor {

2626 pub label: String,

2727 pub format: Option<String>,

2828 #[serde(rename = "type")]

29− pub col_type: Option<String>,

29+ pub ty: Option<String>,

3030 pub width: Option<usize>,

3131}

3232

@@ -200,7 +200,7 @@ pub struct Variable {

200200 pub name: String,

201201 pub value: String,

202202 #[serde(rename = "type")]

203− pub data_type: Option<String>,

203+ pub ty: Option<String>,

204204 pub presentation_hint: Option<VariablePresentationHint>,

205205 pub evaluate_name: Option<String>,

206206 pub variables_reference: usize,

@@ -502,7 +502,7 @@ pub mod requests {

502502 pub struct EvaluateResponse {

503503 pub result: String,

504504 #[serde(rename = "type")]

505− pub data_type: Option<String>,

505+ pub ty: Option<String>,

506506 pub presentation_hint: Option<VariablePresentationHint>,

507507 pub variables_reference: usize,

508508 pub named_variables: Option<usize>,

helix-term/src/commands/dap.rs+1−1

@@ -598,7 +598,7 @@ pub fn dap_variables(cx: &mut Context) {

598598 if let Ok(vars) = response {

599599 variables.reserve(vars.len());

600600 for var in vars {

601− let prefix = match var.data_type {

601+ let prefix = match var.ty {

602602 Some(data_type) => format!("{} ", data_type),

603603 None => "".to_owned(),

604604 };