traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 'required' field when rules with diff fields are aliased to look the same

Browse source
This commit is contained in:
Max Brunsfeld 2019-12-12 11:26:58 -08:00
parent fc19312913
commit 9a0cfa2376
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cli/src/generate/node_types.rs
View file

@ -522,12 +522,16 @@ pub(crate) fn generate_node_types_json(
};
let populate_field_info_json = |json: &mut FieldInfoJSON, info: &FieldInfo| {
json.multiple |= info.quantity.multiple;
json.required &= info.quantity.required;
json.types
.extend(info.types.iter().map(child_type_to_node_type));
json.types.sort_unstable();
json.types.dedup();
if info.types.len() > 0 {
json.multiple |= info.quantity.multiple;
json.required &= info.quantity.required;
json.types
.extend(info.types.iter().map(child_type_to_node_type));
json.types.sort_unstable();
json.types.dedup();
} else {
json.required = false;
}
};
let mut aliases_by_symbol = HashMap::new();
@ -618,6 +622,11 @@ pub(crate) fn generate_node_types_json(
field_info,
);
}
for (existing_field, field_json) in fields_json.iter_mut() {
if !info.fields.contains_key(existing_field) {
field_json.required = false;
}
}
if info.children_without_fields.types.len() > 0 {
populate_field_info_json(
@ -626,6 +635,8 @@ pub(crate) fn generate_node_types_json(
.get_or_insert(FieldInfoJSON::default()),
&info.children_without_fields,
);
} else if let Some(existing_children) = &mut node_type_json.children {
existing_children.required = false;
}
}
}