compiler(rust): Make popup window opening and closing more robust (#9687)

* tests: Add a test for another popup-induced panic

* compiler(rust): Make popup window opening and closing more robust

Do not make the generated rust code trigger a panic when the parent no
longer exists.

Fixes: #9722 (rust only)
Co-authored-by: Olivier Goffart <[email protected]>

Author: hunger

internal/compiler/generator/rust.rs

@@ -2869,11 +2869,18 @@ fn compile_builtin_function_call(
                 arguments
             {
                 let mut parent_ctx = ctx;
-                let mut component_access_tokens = quote!(_self);
+                let mut component_access_tokens = MemberAccess::Direct(quote!(_self));
                 if let llr::PropertyReference::InParent { level, .. } = parent_ref {
                     for _ in 0..level.get() {
-                        component_access_tokens =
-                            quote!(#component_access_tokens.parent.upgrade().unwrap().as_pin_ref());
+                        component_access_tokens = match component_access_tokens {
+                            MemberAccess::Option(token_stream) => MemberAccess::Option(
+                                quote!(#token_stream.and_then(|a| a.as_pin_ref().parent.upgrade())),
+                            ),
+                            MemberAccess::Direct(token_stream) => {
+                                MemberAccess::Option(quote!(#token_stream.parent.upgrade()))
+                            }
+                            _ => unreachable!(),
+                        };
                         parent_ctx = parent_ctx.parent.as_ref().unwrap().ctx;
                     }
                 }
@@ -2894,7 +2901,7 @@ fn compile_builtin_function_call(
                 let close_policy = compile_expression(close_policy, ctx);
                 let window_adapter_tokens = access_window_adapter_field(ctx);
                 let popup_id_name = internal_popup_id(*popup_index as usize);
-                quote!({
+                component_access_tokens.then(|component_access_tokens| quote!({
                     let popup_instance = #popup_window_id::new(#component_access_tokens.self_weak.get().unwrap().clone()).unwrap();
                     let popup_instance_vrc = sp::VRc::map(popup_instance.clone(), |x| x);
                     let position = { let _self = popup_instance_vrc.as_pin_ref(); #position };
@@ -2911,7 +2918,7 @@ fn compile_builtin_function_call(
                         ))
                     );
                     #popup_window_id::user_init(popup_instance_vrc.clone());
-                })
+                }))
             } else {
                 panic!("internal error: invalid args to ShowPopupWindow {arguments:?}")
             }
@@ -2921,18 +2928,34 @@ fn compile_builtin_function_call(
                 arguments
             {
                 let mut parent_ctx = ctx;
-                let mut component_access_tokens = quote!(_self);
+                let mut component_access_tokens = MemberAccess::Direct(quote!(_self));
                 if let llr::PropertyReference::InParent { level, .. } = parent_ref {
                     for _ in 0..level.get() {
-                        component_access_tokens =
-                            quote!(#component_access_tokens.parent.upgrade().unwrap().as_pin_ref());
+                        component_access_tokens = match component_access_tokens {
+                            MemberAccess::Option(token_stream) => MemberAccess::Option(
+                                quote!(#token_stream.and_then(|a| a.parent.upgrade())),
+                            ),
+                            MemberAccess::Direct(token_stream) => {
+                                MemberAccess::Option(quote!(#token_stream.parent.upgrade()))
+                            }
+                            _ => unreachable!(),
+                        };
                         parent_ctx = parent_ctx.parent.as_ref().unwrap().ctx;
                     }
                 }
                 let window_adapter_tokens = access_window_adapter_field(ctx);
                 let popup_id_name = internal_popup_id(*popup_index as usize);
+                let current_id_tokens = match component_access_tokens {
+                    MemberAccess::Option(token_stream) => quote!(
+                        #token_stream.and_then(|a| a.as_pin_ref().#popup_id_name.take())
+                    ),
+                    MemberAccess::Direct(token_stream) => {
+                        quote!(#token_stream.as_ref().#popup_id_name.take())
+                    }
+                    _ => unreachable!(),
+                };
                 quote!(
-                    if let Some(current_id) = #component_access_tokens.#popup_id_name.take() {
+                    if let Some(current_id) = #current_id_tokens {
                         sp::WindowInner::from_pub(#window_adapter_tokens.window()).close_popup(current_id);
                     }
                 )

tests/cases/issues/issue_9722_popup_panic.slint

@@ -0,0 +1,56 @@
+// Copyright © SixtyFPS GmbH <[email protected]>
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
+
+// FIXME: Skip test on C++ and NodeJS since this was only fixed in rust so far
+//ignore: cpp,js
+
+export component TestCase inherits Window {
+    property <bool> condition: true;
+    in property <bool> condition-2: true;
+
+    TouchArea {
+        clicked => {
+            popup.show();
+        }
+        popup := PopupWindow {
+            width: root.width;
+            height: root.height;
+            h := HorizontalLayout {
+                if condition: Rectangle {
+                    background: yellow;
+                    if condition-2 : TouchArea {
+                        clicked => {
+                            condition = false;
+                            debug(h.preferred-width);
+                            popup.close();
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/*
+```rust
+let instance = TestCase::new().unwrap();
+slint_testing::send_mouse_click(&instance, 10., 16.);
+slint_testing::send_mouse_click(&instance, 10., 16.);
+slint_testing::send_mouse_click(&instance, 10., 16.);
+```
+
+```cpp
+auto handle = TestCase::create();
+const TestCase &instance = *handle;
+slint_testing::send_mouse_click(&instance, 10., 16.);
+slint_testing::send_mouse_click(&instance, 10., 16.);
+slint_testing::send_mouse_click(&instance, 10., 16.);
+```
+
+```js
+let instance = new slint.TestCase({});
+slintlib.private_api.send_mouse_click(instance, 10., 16.);
+slintlib.private_api.send_mouse_click(instance, 10., 16.);
+slintlib.private_api.send_mouse_click(instance, 10., 16.);
+```
+*/

tests/driver/rust/build.rs

@@ -25,8 +25,10 @@ fn main() -> std::io::Result<()> {
             && source.contains("//bundle-translations")
         {
             "#[ignore = \"translation bundle not working with the macro\"]"
-        } else if live_preview && source.contains("ComponentContainer") {
-            "#[ignore = \"ComponentContainer doesn't work with the interpreter\"]"
+        } else if live_preview && testcase.is_ignored("js") {
+            "#[ignore = \"Ignored JS testcases ignored in live-preview mode\"]"
+        } else if live_preview && testcase.is_ignored("live-preview") {
+            "#[ignore = \"testcase ignored in live-preview mode\"]"
         } else if live_preview && source.contains("#3464") {
             "#[ignore = \"issue #3464 not fixed with the interpreter\"]"
         } else if live_preview && module_name.contains("widgets_menubar") {