language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-09-27 12:29:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Compiler: Don't panic when a Row is repeated in a GridLayout

Browse source 
Fixes #3729
This commit is contained in:
Olivier Goffart 2023-10-23 15:53:24 +02:00 • committed by Olivier Goffart
parent 49571c8bf2
commit ae4debafe2
2 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
internal/compiler/passes/lower_layout.rs
View file

@ -98,7 +98,20 @@ fn lower_element_layout(
return;
};
match base_type.name.as_str() {
"Row" => panic!("Error caught at element lookup time"),
"Row" => {
// We shouldn't lower layout if we have a Row in there. Unless the Row is the root of a repeated item,
// in which case another error has been reported
assert!(
diag.has_error()
&& Rc::ptr_eq(&component.root_element, elem)
&& component
.parent_element
.upgrade()
.map_or(false, |e| e.borrow().repeated.is_some()),
"Error should have been caught at element lookup time"
);
return;
}
"GridLayout" => lower_grid_layout(component, elem, diag),
"HorizontalLayout" => lower_box_layout(elem, diag, Orientation::Horizontal),
"VerticalLayout" => lower_box_layout(elem, diag, Orientation::Vertical),

14
internal/compiler/tests/syntax/layout/if_in_grid_row.slint Normal file
View file

@ -0,0 +1,14 @@
// Copyright © SixtyFPS GmbH <info@slint.dev>
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial
export component Test {
property <bool> condition;
GridLayout {
// Issue #3729
if (condition) : r := Row {
// ^error{'if' or 'for' expressions are not currently supported in grid layouts}
Rectangle {}
}
}
}