compiler: add missing bindings from organized-data to row/col/rowspan/colspan

With testcase from Olivier for a binding loop col -> x -> col

Author: dfaure-kdab

internal/compiler/layout.rs

@@ -471,9 +471,8 @@ pub struct GridLayout {
 }
 
 impl GridLayout {
-    pub fn visit_named_references(&mut self, visitor: &mut impl FnMut(&mut NamedReference)) {
+    pub fn visit_rowcol_named_references(&mut self, visitor: &mut impl FnMut(&mut NamedReference)) {
         for cell in &mut self.elems {
-            cell.item.constraints.visit_named_references(visitor);
             if let RowColExpr::Named(ref mut e) = cell.col_expr {
                 visitor(e);
             }
@@ -487,6 +486,13 @@ impl GridLayout {
                 visitor(e);
             }
         }
+    }
+
+    pub fn visit_named_references(&mut self, visitor: &mut impl FnMut(&mut NamedReference)) {
+        self.visit_rowcol_named_references(visitor);
+        for cell in &mut self.elems {
+            cell.item.constraints.visit_named_references(visitor);
+        }
         self.geometry.visit_named_references(visitor);
     }
 }

internal/compiler/passes/binding_analysis.rs

@@ -516,9 +516,10 @@ fn recurse_expression(
             g.visit_named_references(&mut |nr| vis(&nr.clone().into(), P))
         }
         Expression::OrganizeGridLayout(layout) => {
-            let mut g = layout.geometry.clone();
-            g.rect = Default::default();
-            g.visit_named_references(&mut |nr| vis(&nr.clone().into(), P))
+            let mut layout = layout.clone();
+            layout.visit_rowcol_named_references(&mut |nr: &mut NamedReference| {
+                vis(&nr.clone().into(), P)
+            });
         }
         Expression::SolveGridLayout { layout_organized_data_prop, layout, orientation }
         | Expression::ComputeGridLayoutInfo { layout_organized_data_prop, layout, orientation } => {

internal/compiler/tests/syntax/basic/gridlayout_binding_loop.slint

@@ -0,0 +1,19 @@
+// Copyright © Klarälvdalens Datakonsult AB, a KDAB Group company, [email protected]
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
+export component TestCase inherits Window {
+//                                 ^warning{The binding for the property 'layoutinfo-h' is part of a binding loop (lay1.width -> lay1.layout-cache-h -> x -> col -> lay1.layout-organized-data -> lay1.layoutinfo-h -> root.layoutinfo-h).↵This was allowed in previous version of Slint, but is deprecated and may cause panic at runtime}
+
+    lay1 := GridLayout {
+//          ^warning{The binding for the property 'width' is part of a binding loop (lay1.width -> lay1.layout-cache-h -> x -> col -> lay1.layout-organized-data -> lay1.layoutinfo-h -> root.layoutinfo-h).↵This was allowed in previous version of Slint, but is deprecated and may cause panic at runtime}
+//          ^^warning{The binding for the property 'layout-cache-h' is part of a binding loop (lay1.width -> lay1.layout-cache-h -> x -> col -> lay1.layout-organized-data -> lay1.layoutinfo-h -> root.layoutinfo-h).↵This was allowed in previous version of Slint, but is deprecated and may cause panic at runtime}
+//          ^^^warning{The binding for the property 'x' is part of a binding loop (lay1.width -> lay1.layout-cache-h -> x -> col -> lay1.layout-organized-data -> lay1.layoutinfo-h -> root.layoutinfo-h).↵This was allowed in previous version of Slint, but is deprecated and may cause panic at runtime}
+//          ^^^^warning{The binding for the property 'layoutinfo-h' is part of a binding loop (lay1.width -> lay1.layout-cache-h -> x -> col -> lay1.layout-organized-data -> lay1.layoutinfo-h -> root.layoutinfo-h).↵This was allowed in previous version of Slint, but is deprecated and may cause panic at runtime}
+//          ^^^^^warning{The binding for the property 'layout-organized-data' is part of a binding loop (lay1.width -> lay1.layout-cache-h -> x -> col -> lay1.layout-organized-data -> lay1.layoutinfo-h -> root.layoutinfo-h).↵This was allowed in previous version of Slint, but is deprecated and may cause panic at runtime}
+        Text {
+            row: 1;
+            col: self.x > 10px ? 3 : 4;
+//               ^warning{The binding for the property 'col' is part of a binding loop (lay1.width -> lay1.layout-cache-h -> x -> col -> lay1.layout-organized-data -> lay1.layoutinfo-h -> root.layoutinfo-h).↵This was allowed in previous version of Slint, but is deprecated and may cause panic at runtime}
+        }
+    }
+}