Refactor typeregister's BUILTIN_ENUMS => BUILTIN.enums

This will allow us to add more buildin types to this thread local
in follow-up patches, to reduce the number of thread local slots.

Author: milianw

internal/compiler/expression_tree.rs

@@ -259,7 +259,7 @@ impl BuiltinFunction {
             }),
             BuiltinFunction::ColorScheme => interned_type!(Function {
                 return_type: Type::Enumeration(
-                    crate::typeregister::BUILTIN_ENUMS.with(|e| e.ColorScheme.clone()),
+                    crate::typeregister::BUILTIN.with(|e| e.enums.ColorScheme.clone()),
                 ),
                 args: vec![],
             }),

internal/compiler/llr/lower_expression.rs

@@ -19,7 +19,7 @@ use crate::namedreference::NamedReference;
 use crate::object_tree::{Element, ElementRc, PropertyAnimation};
 use crate::{
     expression_tree::{BuiltinFunction, Expression as tree_Expression},
-    typeregister::BUILTIN_ENUMS,
+    typeregister::BUILTIN,
 };
 
 pub struct ExpressionContext<'a> {
@@ -415,7 +415,7 @@ pub fn lower_animation(a: &PropertyAnimation, ctx: &ExpressionContext<'_>) -> An
             (SmolStr::new_static("iteration-count"), Type::Float32),
             (
                 SmolStr::new_static("direction"),
-                Type::Enumeration(BUILTIN_ENUMS.with(|e| e.AnimationDirection.clone())),
+                Type::Enumeration(BUILTIN.with(|e| e.enums.AnimationDirection.clone())),
             ),
             (SmolStr::new_static("easing"), Type::Easing),
             (SmolStr::new_static("delay"), Type::Int32),
@@ -546,7 +546,7 @@ fn solve_layout(
             if let (Some(button_roles), Orientation::Horizontal) = (&layout.dialog_button_roles, o)
             {
                 let cells_ty = cells.ty(ctx);
-                let e = crate::typeregister::BUILTIN_ENUMS.with(|e| e.DialogButtonRole.clone());
+                let e = crate::typeregister::BUILTIN.with(|e| e.enums.DialogButtonRole.clone());
                 let roles = button_roles
                     .iter()
                     .map(|r| {
@@ -616,8 +616,8 @@ fn solve_layout(
                     ("padding", padding.ty(ctx), padding),
                     (
                         "alignment",
-                        crate::typeregister::BUILTIN_ENUMS
-                            .with(|e| Type::Enumeration(e.LayoutAlignment.clone())),
+                        crate::typeregister::BUILTIN
+                            .with(|e| Type::Enumeration(e.enums.LayoutAlignment.clone())),
                         bld.alignment,
                     ),
                     ("cells", bld.cells.ty(ctx), bld.cells),
@@ -674,7 +674,7 @@ fn box_layout_data(
     let alignment = if let Some(expr) = &layout.geometry.alignment {
         llr_Expression::PropertyReference(ctx.map_property_reference(expr))
     } else {
-        let e = crate::typeregister::BUILTIN_ENUMS.with(|e| e.LayoutAlignment.clone());
+        let e = crate::typeregister::BUILTIN.with(|e| e.enums.LayoutAlignment.clone());
         llr_Expression::EnumerationValue(EnumerationValue {
             value: e.default_value,
             enumeration: e,

internal/compiler/lookup.rs

@@ -823,10 +823,10 @@ impl LookupObject for SlintInternal {
             f(
                 "color-scheme",
                 if style.is_some_and(|s| s.ends_with("-light")) {
-                    let e = crate::typeregister::BUILTIN_ENUMS.with(|e| e.ColorScheme.clone());
+                    let e = crate::typeregister::BUILTIN.with(|e| e.enums.ColorScheme.clone());
                     Expression::EnumerationValue(e.try_value_from_string("light").unwrap())
                 } else if style.is_some_and(|s| s.ends_with("-dark")) {
-                    let e = crate::typeregister::BUILTIN_ENUMS.with(|e| e.ColorScheme.clone());
+                    let e = crate::typeregister::BUILTIN.with(|e| e.enums.ColorScheme.clone());
                     Expression::EnumerationValue(e.try_value_from_string("dark").unwrap())
                 } else {
                     Expression::FunctionCall {

internal/compiler/passes/compile_paths.rs

@@ -151,7 +151,7 @@ fn compile_path_from_string_literal(
     )?;
     let path = builder.build();
 
-    let event_enum = crate::typeregister::BUILTIN_ENUMS.with(|e| e.PathEvent.clone());
+    let event_enum = crate::typeregister::BUILTIN.with(|e| e.enums.PathEvent.clone());
     let point_type = Type::Struct(Rc::new(Struct {
         fields: IntoIterator::into_iter([
             (SmolStr::new_static("x"), Type::Float32),

internal/compiler/passes/lower_accessibility.rs

@@ -63,7 +63,7 @@ fn apply_builtin(e: &ElementRc) {
     let bty = if let Some(bty) = e.borrow().builtin_type() { bty } else { return };
     if bty.name == "Text" {
         e.borrow_mut().set_binding_if_not_set("accessible-role".into(), || {
-            let enum_ty = crate::typeregister::BUILTIN_ENUMS.with(|e| e.AccessibleRole.clone());
+            let enum_ty = crate::typeregister::BUILTIN.with(|e| e.enums.AccessibleRole.clone());
             Expression::EnumerationValue(EnumerationValue {
                 value: enum_ty.values.iter().position(|v| v == "text").unwrap(),
                 enumeration: enum_ty,

internal/compiler/passes/lower_popups.rs

@@ -157,7 +157,7 @@ fn lower_popup_window(
             }
         },
         None => {
-            let enum_ty = crate::typeregister::BUILTIN_ENUMS.with(|e| e.PopupClosePolicy.clone());
+            let enum_ty = crate::typeregister::BUILTIN.with(|e| e.enums.PopupClosePolicy.clone());
 
             let mut value = String::from("close-on-click");
 

internal/compiler/passes/materialize_fake_properties.rs

@@ -116,7 +116,7 @@ fn should_materialize(
         } else if prop == "close-policy" {
             // PopupWindow::close-policy
             return Some(Type::Enumeration(
-                crate::typeregister::BUILTIN_ENUMS.with(|e| e.PopupClosePolicy.clone()),
+                crate::typeregister::BUILTIN.with(|e| e.enums.PopupClosePolicy.clone()),
             ));
         }
     }

internal/compiler/typeregister.rs

@@ -77,8 +77,18 @@ macro_rules! declare_enums {
 
 i_slint_common::for_each_enums!(declare_enums);
 
+pub struct BuiltinTypes {
+    pub enums: BuiltinEnums,
+}
+
+impl BuiltinTypes {
+    fn new() -> Self {
+        Self { enums: BuiltinEnums::new() }
+    }
+}
+
 thread_local! {
-    pub static BUILTIN_ENUMS: BuiltinEnums = BuiltinEnums::new();
+    pub static BUILTIN: BuiltinTypes = BuiltinTypes::new();
 }
 
 const RESERVED_OTHER_PROPERTIES: &[(&str, Type)] = &[
@@ -163,12 +173,12 @@ pub fn reserved_properties() -> impl Iterator<Item = (&'static str, Type, Proper
             ("clear-focus", BuiltinFunction::ClearFocusItem.ty(), PropertyVisibility::Public),
             (
                 "dialog-button-role",
-                Type::Enumeration(BUILTIN_ENUMS.with(|e| e.DialogButtonRole.clone())),
+                Type::Enumeration(BUILTIN.with(|e| e.enums.DialogButtonRole.clone())),
                 PropertyVisibility::Constexpr,
             ),
             (
                 "accessible-role",
-                Type::Enumeration(BUILTIN_ENUMS.with(|e| e.AccessibleRole.clone())),
+                Type::Enumeration(BUILTIN.with(|e| e.enums.AccessibleRole.clone())),
                 PropertyVisibility::Constexpr,
             ),
         ]))
@@ -304,7 +314,7 @@ impl TypeRegister {
         register.insert_type(Type::Rem);
         register.types.insert("Point".into(), logical_point_type());
 
-        BUILTIN_ENUMS.with(|e| e.fill_register(&mut register));
+        BUILTIN.with(|e| e.enums.fill_register(&mut register));
 
         register.supported_property_animation_types.insert(Type::Float32.to_string());
         register.supported_property_animation_types.insert(Type::Int32.to_string());
@@ -323,7 +333,7 @@ impl TypeRegister {
             ($pub_type:ident, Coord) => { Type::LogicalLength };
             ($pub_type:ident, KeyboardModifiers) => { $pub_type.clone() };
             ($pub_type:ident, $_:ident) => {
-                BUILTIN_ENUMS.with(|e| Type::Enumeration(e.$pub_type.clone()))
+                BUILTIN.with(|e| Type::Enumeration(e.enums.$pub_type.clone()))
             };
         }
         #[rustfmt::skip]

tools/lsp/preview/properties.rs

@@ -509,7 +509,7 @@ pub(super) fn get_properties(
             name: "accessible-role".into(),
             priority: DEFAULT_PRIORITY - 100,
             ty: Type::Enumeration(
-                i_slint_compiler::typeregister::BUILTIN_ENUMS.with(|e| e.AccessibleRole.clone()),
+                i_slint_compiler::typeregister::BUILTIN.with(|e| e.enums.AccessibleRole.clone()),
             ),
             declared_at: None,
             defined_at: None,