language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 02:39:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Janitor: Remove BuiltinElement::reserved_properties

Browse source 
It was added when support for `font-metrics` was added, but there is no
reason why this can't simply be in the `properties` hash.
This commit is contained in:
Olivier Goffart 2024-11-03 19:27:42 +01:00
parent 6da0f55b05
commit b44172be4f
3 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/compiler/langtype.rs
View file

@ -412,11 +412,7 @@ impl ElementType {
} else {
Cow::Borrowed(name)
};
match b
.properties
.get(resolved_name.as_ref())
.or_else(|| b.reserved_properties.get(resolved_name.as_ref()))
{
match b.properties.get(resolved_name.as_ref()) {
None => {
if b.is_non_item_type {
PropertyLookupResult {
@ -483,12 +479,9 @@ impl ElementType {
);
r
}
Self::Builtin(b) => b
.properties
.iter()
.chain(b.reserved_properties.iter())
.map(|(k, t)| (k.clone(), t.ty.clone()))
.collect(),
Self::Builtin(b) => {
b.properties.iter().map(|(k, t)| (k.clone(), t.ty.clone())).collect()
}
Self::Native(n) => {
n.properties.iter().map(|(k, t)| (k.clone(), t.ty.clone())).collect()
}
@ -733,7 +726,6 @@ pub struct BuiltinElement {
pub name: SmolStr,
pub native_class: Rc<NativeClass>,
pub properties: BTreeMap<SmolStr, BuiltinPropertyInfo>,
pub reserved_properties: BTreeMap<SmolStr, BuiltinPropertyInfo>,
pub additional_accepted_child_types: HashMap<SmolStr, ElementType>,
pub disallow_global_types_as_child_elements: bool,
/// Non-item type do not have reserved properties (x/width/rowspan/...) added to them (eg: PropertyAnimation)