First stage of cleaning up the export handling of the slint root comp…

…onent We implicitly export the last component of a .slint file to the generator. Issue a warning when that happens and suggest to export it explicitly.
slint-ui · tronical · Jan 23, 2023 · Jan 20, 2023 · Jan 23, 2023 · Jan 23, 2023
commit ec64754b96cc5a6ed6107d33d4b34c4c761c5280
diff --git a/examples/carousel/ui/carousel_demo.slint b/examples/carousel/ui/carousel_demo.slint
@@ -5,7 +5,7 @@ import { Carousel } from "carousel.slint";
 import { Card } from "card.slint";
 import { Theme } from "theme.slint";
 
-component MainWindow inherits Window {
+export component MainWindow inherits Window {
     private property<[{ title: string, image: image}]> navigation-items: [
        { title: "Settings", image: @image-url("svg/settings_black.svg") },
        { title: "Home", image: @image-url("svg/home_black.svg") },
@@ -38,4 +38,4 @@ component MainWindow inherits Window {
             clicked => { root.selected-index = index; }
         }  
     }
-}
+}
diff --git a/examples/gallery/ui/gallery_settings.slint b/examples/gallery/ui/gallery_settings.slint
@@ -1,6 +1,6 @@
 // Copyright © SixtyFPS GmbH <info@slint-ui.com>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
-global GallerySettings  {
+export global GallerySettings  {
     in property<bool> widgets-disabled: false;
-}
+}
diff --git a/examples/opengl_underlay/scene.slint b/examples/opengl_underlay/scene.slint
@@ -4,7 +4,7 @@
 import { ScrollView, Button, CheckBox, SpinBox, Slider, GroupBox, LineEdit, StandardListView,
     ComboBox, HorizontalBox, VerticalBox, GridBox, TabWidget, TextEdit, AboutSixtyFPS } from "std-widgets.slint";
 
-component App inherits Window {
+export component App inherits Window {
     preferred-width: 500px;
     preferred-height: 600px;
     title: "Slint OpenGL Underlay Example";

diff --git a/examples/printerdemo_old/ui/print_page.slint b/examples/printerdemo_old/ui/print_page.slint
@@ -4,7 +4,7 @@
 import { SpinBox, Button, CheckBox, Slider, GroupBox, StandardListView, GridBox } from "std-widgets.slint";
 import { Label, Page, Preview } from "common.slint";
 
-component PrintPage inherits Page {
+export component PrintPage inherits Page {
 
      layout := GridLayout {
         padding-left: 40px;

diff --git a/examples/printerdemo_old/ui/printerdemo.slint b/examples/printerdemo_old/ui/printerdemo.slint
@@ -54,7 +54,7 @@ struct InkLevel  {
     level: float,
 }
 
-component MainWindow inherits Window {
+export component MainWindow inherits Window {
     callback quit();
 
     width: 800px;

diff --git a/internal/compiler/object_tree.rs b/internal/compiler/object_tree.rs
@@ -200,7 +200,7 @@ pub struct UsedSubTypes {
 /// Or is materialized for repeated expression.
 #[derive(Default, Debug)]
 pub struct Component {
-    //     node: SyntaxNode,
+    pub node: Option<SyntaxNode>,
     pub id: String,
     pub root_element: ElementRc,
 
@@ -254,6 +254,7 @@ impl Component {
         let mut child_insertion_point = None;
         let is_legacy_syntax = node.child_token(SyntaxKind::ColonEqual).is_some();
         let c = Component {
+            node: Some(node.clone().into()),
             id: parser::identifier_text(&node.DeclaredIdentifier()).unwrap_or_default(),
             root_element: Element::from_node(
                 node.Element(),
@@ -2215,6 +2216,15 @@ impl Exports {
 
         if sorted_deduped_exports.is_empty() {
             if let Some(last_compo) = inner_components.last() {
+                if last_compo.is_global() {
+                    diag.push_warning(
+                        "Global singleton is implicitly marked for export. This is deprecated and it should be explicitly exported"
+                            .into(),
+                        &last_compo.node,
+                    );
+                } else {
+                    diag.push_warning("Component is implicitly marked for export. This is deprecated and it should be explicitly exported".into(), &last_compo.node)
+                }
                 let name = last_compo.id.clone();
                 sorted_deduped_exports.push((
                     ExportedName { name, name_ident: doc.clone().into() },

diff --git a/internal/compiler/passes/inlining.rs b/internal/compiler/passes/inlining.rs
@@ -268,6 +268,7 @@ fn duplicate_sub_component(
 ) -> Rc<Component> {
     debug_assert!(component_to_duplicate.parent_element.upgrade().is_some());
     let new_component = Component {
+        node: component_to_duplicate.node.clone(),
         id: component_to_duplicate.id.clone(),
         root_element: duplicate_element_with_mapping(
             &component_to_duplicate.root_element,

diff --git a/internal/compiler/tests/syntax/accessibility/accessible_properties.slint b/internal/compiler/tests/syntax/accessibility/accessible_properties.slint
@@ -19,7 +19,7 @@ Button3 := Rectangle {
     }
 }
 
-Test := Window {
+export Test := Window {
 
     Button1 { }
     Button1 { accessible-description: "ok"; } // ok because Button1 has a role

diff --git a/internal/compiler/tests/syntax/analysis/binding_loop1.slint b/internal/compiler/tests/syntax/analysis/binding_loop1.slint
@@ -14,7 +14,7 @@ WithStates := Rectangle {
     ]
 }
 
-Test := Rectangle {
+export Test := Rectangle {
 
     property <int> a: 45 + root.b;
     //               ^error{The binding for the property 'a' is part of a binding loop}

diff --git a/internal/compiler/tests/syntax/analysis/binding_loop2.slint b/internal/compiler/tests/syntax/analysis/binding_loop2.slint
@@ -35,7 +35,7 @@ T4 := Rectangle {
     property <length> my_property <=> x;
 }
 
-App := Rectangle {
+export App := Rectangle {
 
 
     VerticalLayout {

diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_function.slint b/internal/compiler/tests/syntax/analysis/binding_loop_function.slint
@@ -18,7 +18,7 @@ Compo1 := Rectangle {
 //  ^error{The binding for the property 'bb' is part of a binding loop}
 }
 
-App := Rectangle {
+export App := Rectangle {
     cc := Compo1 {
         aa() => { return self.a; }
 //      ^error{The binding for the property 'aa' is part of a binding loop}
@@ -29,4 +29,4 @@ App := Rectangle {
 
 
 
-}
+}
diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_issue_772.slint b/internal/compiler/tests/syntax/analysis/binding_loop_issue_772.slint
@@ -6,7 +6,7 @@ Alias := Rectangle {
     property <int> ps_width <=> viewport_width;
 }
 
-Foo := Rectangle {
+export Foo := Rectangle {
     property <int> base-prop: alias.viewport_width;
     //                       ^error{The binding for the property 'base-prop' is part of a binding loop}
 

diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_layout.slint b/internal/compiler/tests/syntax/analysis/binding_loop_layout.slint
@@ -19,7 +19,7 @@ TC := Rectangle {
 }
 
 
-Test := Rectangle {
+export Test := Rectangle {
     VerticalLayout {
 //  ^error{The binding for the property 'layoutinfo-h' is part of a binding loop}  // FIXME: That's an internal property, but people might understand
 //  ^^error{The binding for the property 'min-width' is part of a binding loop}

diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_layout2.slint b/internal/compiler/tests/syntax/analysis/binding_loop_layout2.slint
@@ -26,7 +26,7 @@ Wrap := Rectangle {
     property <bool> test: square.width == square.height;
 }
 
-Test := Rectangle {
+export Test := Rectangle {
     property <image> source;
     GridLayout {
 //  ^error{The binding for the property 'layout-cache-h' is part of a binding loop}

diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_layout3.slint b/internal/compiler/tests/syntax/analysis/binding_loop_layout3.slint
@@ -22,7 +22,7 @@ Compo := Rectangle {
 
 }
 
-Foo := Rectangle {
+export Foo := Rectangle {
     Compo {
 //  ^error{The binding for the property 'preferred-width' is part of a binding loop}
         the_text: self.preferred-width / 1px;

diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_self.slint b/internal/compiler/tests/syntax/analysis/binding_loop_self.slint
@@ -5,7 +5,7 @@
 
 Key := Rectangle { property <int> pos; property <int> num_elements; }
 
-Test := Rectangle {
+export Test := Rectangle {
     Rectangle {
         property <int> num_elements;
         num-elements: 4;

diff --git a/internal/compiler/tests/syntax/basic/animate.slint b/internal/compiler/tests/syntax/basic/animate.slint
@@ -1,7 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint-ui.com>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
-SuperSimple := Rectangle {
+export SuperSimple := Rectangle {
 
     animate x {
         duration: 1000ms;

diff --git a/internal/compiler/tests/syntax/basic/arithmetic_op.slint b/internal/compiler/tests/syntax/basic/arithmetic_op.slint
@@ -1,7 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint-ui.com>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
-SuperSimple := Rectangle {
+export SuperSimple := Rectangle {
     property<duration> p1: 3s + 1ms;
     property<int> p2: 3s + 1;
 //                        ^error{Cannot convert float to duration}

diff --git a/internal/compiler/tests/syntax/basic/array.slint b/internal/compiler/tests/syntax/basic/array.slint
@@ -1,7 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint-ui.com>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
-Test := Window {
+export Test := Window {
     a: [,];
 //      ^error{invalid expression}
 }
diff --git a/internal/compiler/tests/syntax/basic/assign.slint b/internal/compiler/tests/syntax/basic/assign.slint
@@ -1,7 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint-ui.com>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
-SuperSimple := Rectangle {
+export SuperSimple := Rectangle {
     TouchArea {
         clicked => { root.x = 1phx; }
     }

diff --git a/internal/compiler/tests/syntax/basic/box_shadow.slint b/internal/compiler/tests/syntax/basic/box_shadow.slint
@@ -5,7 +5,7 @@ Foo := Rectangle {
     drop-shadow-color: red;
 }
 
-SuperSimple := Window {
+export SuperSimple := Window {
     drop-shadow-color: #00000080;
 //                    ^warning{The drop-shadow-color property cannot be used on the root element, the shadow will not be visible}
 

diff --git a/internal/compiler/tests/syntax/basic/children_placeholder.slint b/internal/compiler/tests/syntax/basic/children_placeholder.slint
@@ -33,7 +33,7 @@ TestBox2 := Rectangle {
 //  ^error{The @children placeholder can only appear once in an element hierarchy}
 }
 
-Final := TestBox {
+export Final := TestBox {
     Rectangle {
         @children
 //      ^error{children placeholder not allowed in the final component}

diff --git a/internal/compiler/tests/syntax/basic/children_placeholder_2.slint b/internal/compiler/tests/syntax/basic/children_placeholder_2.slint
@@ -1,7 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint-ui.com>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
-Final := Window {
+export Final := Window {
     VerticalLayout {
         @children
 //      ^error{children placeholder not allowed in the final component}

diff --git a/internal/compiler/tests/syntax/basic/clip.slint b/internal/compiler/tests/syntax/basic/clip.slint
@@ -3,7 +3,7 @@
 
 MyTouchArea := TouchArea { }
 
-SubElements := Rectangle {
+export SubElements := Rectangle {
     Rectangle {
         clip: 42;
 //           ^error{Cannot convert float to bool}

diff --git a/internal/compiler/tests/syntax/basic/comments.slint b/internal/compiler/tests/syntax/basic/comments.slint
@@ -4,7 +4,7 @@
 // comment
 
 // line comment
-SuperSimple := Rectangle {
+export SuperSimple := Rectangle {
     /* block comment */
     background: green;
 

diff --git a/internal/compiler/tests/syntax/basic/comparison_operator.slint b/internal/compiler/tests/syntax/basic/comparison_operator.slint
@@ -1,7 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint-ui.com>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
-SuperSimple := Rectangle {
+export SuperSimple := Rectangle {
     property<bool> zz: aa > bb == cc
 //                             ^error{Use parentheses to disambiguate equality expression on the same level}
                 < dd;

diff --git a/internal/compiler/tests/syntax/basic/condition_operator.slint b/internal/compiler/tests/syntax/basic/condition_operator.slint
@@ -26,7 +26,7 @@ SuperSimple := Rectangle {
 }
 
 
-Test2 := Rectangle {
+export Test2 := Rectangle {
     background: {
 //             ^error{Cannot convert void to brush}
         if (true) {

diff --git a/internal/compiler/tests/syntax/basic/dialog.slint b/internal/compiler/tests/syntax/basic/dialog.slint
@@ -47,7 +47,7 @@ MyDialog4 := Dialog {
     }
 }
 
-Test := Rectangle {
+export Test := Rectangle {
     MyDiag1 {}
     MyDiag2 {}
     MyDiag3 {}

diff --git a/internal/compiler/tests/syntax/basic/dialog2.slint b/internal/compiler/tests/syntax/basic/dialog2.slint
@@ -3,8 +3,8 @@
 
 import { StandardButton } from "std-widgets.slint";
 
-Test := Dialog {
-//     ^error{A Dialog must have a single child element that is not StandardButton}
+export Test := Dialog {
+//            ^error{A Dialog must have a single child element that is not StandardButton}
     StandardButton { kind: ok; }
     StandardButton { }
 //  ^error{The `kind` property of the StandardButton in a Dialog must be set}

diff --git a/internal/compiler/tests/syntax/basic/double_binding.slint b/internal/compiler/tests/syntax/basic/double_binding.slint
@@ -1,7 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint-ui.com>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
-X := Rectangle {
+export X := Rectangle {
 
     x: 42phx;
     x: 32phx;

diff --git a/internal/compiler/tests/syntax/basic/double_color.slint b/internal/compiler/tests/syntax/basic/double_color.slint
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
 
-SuperSimple := Rectangle {
+export SuperSimple := Rectangle {
     background: green;
     background: red;
 //  ^error{Duplicated property}

diff --git a/internal/compiler/tests/syntax/basic/duplicated_id.slint b/internal/compiler/tests/syntax/basic/duplicated_id.slint
@@ -26,7 +26,7 @@ SubElement := Rectangle {
 //          ^error{duplicated element id 'hello'}
 }
 
-TestCase := Rectangle {
+export TestCase := Rectangle {
 
     unique := Rectangle {
         foo := SubElement { }

diff --git a/internal/compiler/tests/syntax/basic/easing.slint b/internal/compiler/tests/syntax/basic/easing.slint
@@ -1,7 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint-ui.com>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
-X := Rectangle {
+export X := Rectangle {
     animate x { easing: ease-in; }
     animate y { easing: foo; }
     //                  ^error{Unknown unqualified identifier 'foo'}

diff --git a/internal/compiler/tests/syntax/basic/easing_not_called.slint b/internal/compiler/tests/syntax/basic/easing_not_called.slint
@@ -3,7 +3,7 @@
 
 // Cannot be put in the easing.slint test because it is in a different pass
 
-X := Rectangle {
+export X := Rectangle {
     property <int> g; animate g { easing: cubic-bezier; }
     //                                    ^error{must be called}
 }
diff --git a/internal/compiler/tests/syntax/basic/for.slint b/internal/compiler/tests/syntax/basic/for.slint
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
 
-SuperSimple := Rectangle {
+export SuperSimple := Rectangle {
     background: green;
 
     for xx Text {}

diff --git a/internal/compiler/tests/syntax/basic/image.slint b/internal/compiler/tests/syntax/basic/image.slint
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
 
-SubElements := Rectangle {
+export SubElements := Rectangle {
 
     background: blue;
 

diff --git a/internal/compiler/tests/syntax/basic/inline_component.slint b/internal/compiler/tests/syntax/basic/inline_component.slint
@@ -7,7 +7,7 @@ Inline1 := Rectangle {
     }
 }
 
-SubElements := Rectangle {
+export SubElements := Rectangle {
     Inline1 {
         background: yellow;
         invalid: yellow;

diff --git a/internal/compiler/tests/syntax/basic/item_as_property.slint b/internal/compiler/tests/syntax/basic/item_as_property.slint
@@ -19,7 +19,7 @@ Comp := Rectangle {
 //                    ^error{'Rectangle' is not a valid type}
 }
 
-Foo := Rectangle {
+export Foo := Rectangle {
     xx := Rectangle { }
     Comp {
         r: xx;

diff --git a/internal/compiler/tests/syntax/basic/layout.slint b/internal/compiler/tests/syntax/basic/layout.slint
@@ -1,7 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint-ui.com>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
-X := Rectangle {
+export X := Rectangle {
 
     lay := GridLayout {
         property<string> foo: "hello";

diff --git a/internal/compiler/tests/syntax/basic/layout2.slint b/internal/compiler/tests/syntax/basic/layout2.slint
@@ -1,7 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint-ui.com>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
 
-X := Rectangle {
+export X := Rectangle {
 
     lay := GridLayout {
         property<string> foo: "hello";