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

Fix insertion point of @children

Browse source 
Don't always appends at the end

Fixes #4935
This commit is contained in:
Olivier Goffart 2024-03-26 16:10:35 +01:00
parent 68083243b2
commit 18eea8602a
5 changed files with 38 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/compiler/object_tree.rs
View file

@ -258,7 +258,7 @@ pub struct PopupWindow {
pub parent_element: ElementRc,
}
type ChildrenInsertionPoint = (ElementRc, syntax_nodes::ChildrenPlaceholder);
type ChildrenInsertionPoint = (ElementRc, usize, syntax_nodes::ChildrenPlaceholder);
/// Used sub types for a root component
#[derive(Debug, Default)]
@ -1307,7 +1307,7 @@ impl Element {
diag,
tr,
);
if let Some((_, se)) = sub_child_insertion_point {
if let Some((_, _, se)) = sub_child_insertion_point {
diag.push_error(
"The @children placeholder cannot appear in a repeated element".into(),
&se,
@ -1324,7 +1324,7 @@ impl Element {
diag,
tr,
);
if let Some((_, se)) = sub_child_insertion_point {
if let Some((_, _, se)) = sub_child_insertion_point {
diag.push_error(
"The @children placeholder cannot appear in a conditional element".into(),
&se,
@ -1338,19 +1338,19 @@ impl Element {
&se,
)
} else {
children_placeholder = Some(se.clone().into());
children_placeholder = Some((se.clone().into(), r.borrow().children.len()));
}
}
}
if let Some(children_placeholder) = children_placeholder {
if let Some((children_placeholder, index)) = children_placeholder {
if component_child_insertion_point.is_some() {
diag.push_error(
"The @children placeholder can only appear once in an element hierarchy".into(),
&children_placeholder,
)
} else {
*component_child_insertion_point = Some((r.clone(), children_placeholder));
*component_child_insertion_point = Some((r.clone(), index, children_placeholder));
}
}