language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 14:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Allow to give a name to for and if

Browse source
This commit is contained in:
Olivier Goffart 2021-06-18 16:17:06 +02:00
parent 52e85933ed
commit 42c25248a8
8 changed files with 121 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

64
sixtyfps_compiler/object_tree.rs
View file

@ -728,26 +728,14 @@ impl Element {
for se in node.children() {
if se.kind() == SyntaxKind::SubElement {
let id = identifier_text(&se).unwrap_or_default();
if matches!(id.as_ref(), "parent" | "self" | "root") {
diag.push_error(
format!("'{}' is a reserved id", id),
&se.child_token(SyntaxKind::Identifier).unwrap(),
)
}
if let Some(element_node) = se.child_node(SyntaxKind::Element) {
let parent_type = r.borrow().base_type.clone();
r.borrow_mut().children.push(Element::from_node(
element_node.into(),
id,
parent_type,
component_child_insertion_point,
diag,
tr,
));
} else {
assert!(diag.has_error());
}
let parent_type = r.borrow().base_type.clone();
r.borrow_mut().children.push(Element::from_sub_element_node(
se.into(),
parent_type,
component_child_insertion_point,
diag,
tr,
));
} else if se.kind() == SyntaxKind::RepeatedElement {
let rep = Element::from_repeated_node(
se.into(),
@ -832,6 +820,30 @@ impl Element {
r
}
fn from_sub_element_node(
node: syntax_nodes::SubElement,
parent_type: Type,
component_child_insertion_point: &mut Option<ChildrenInsertionPoint>,
diag: &mut BuildDiagnostics,
tr: &TypeRegister,
) -> ElementRc {
let id = identifier_text(&node).unwrap_or_default();
if matches!(id.as_ref(), "parent" | "self" | "root") {
diag.push_error(
format!("'{}' is a reserved id", id),
&node.child_token(SyntaxKind::Identifier).unwrap(),
)
}
Element::from_node(
node.Element(),
id,
parent_type,
component_child_insertion_point,
diag,
tr,
)
}
fn from_repeated_node(
node: syntax_nodes::RepeatedElement,
parent: &ElementRc,
@ -860,10 +872,9 @@ impl Element {
is_conditional_element: false,
is_listview,
};
let e = Element::from_node(
node.Element(),
String::new(),
parent.borrow().base_type.to_owned(),
let e = Element::from_sub_element_node(
node.SubElement(),
parent.borrow().base_type.clone(),
component_child_insertion_point,
diag,
tr,
@ -886,9 +897,8 @@ impl Element {
is_conditional_element: true,
is_listview: None,
};
let e = Element::from_node(
node.Element(),
String::new(),
let e = Element::from_sub_element_node(
node.SubElement(),
parent_type,
component_child_insertion_point,
diag,