Add StyledText type

Author: expenses

api/node/rust/interpreter/value.rs

@@ -25,6 +25,7 @@ pub enum JsValueType {
     Struct,
     Brush,
     Image,
+    StyledText,
 }
 
 impl From<slint_interpreter::ValueType> for JsValueType {
@@ -37,6 +38,7 @@ impl From<slint_interpreter::ValueType> for JsValueType {
             slint_interpreter::ValueType::Struct => JsValueType::Struct,
             slint_interpreter::ValueType::Brush => JsValueType::Brush,
             slint_interpreter::ValueType::Image => JsValueType::Image,
+            slint_interpreter::ValueType::StyledText => JsValueType::StyledText,
             _ => JsValueType::Void,
         }
     }
@@ -290,7 +292,8 @@ pub fn to_value(env: &Env, unknown: JsUnknown, typ: &Type) -> Result<Value> {
         | Type::Easing
         | Type::PathData
         | Type::LayoutCache
-        | Type::ElementReference => Err(napi::Error::from_reason("reason")),
+        | Type::ElementReference
+        | Type::StyledText => Err(napi::Error::from_reason("reason")),
     }
 }
 

internal/compiler/builtin_macros.rs

@@ -343,7 +343,12 @@ fn to_debug_string(
         Type::Float32 | Type::Int32 => expr.maybe_convert_to(Type::String, node, diag),
         Type::String => expr,
         // TODO
-        Type::Color | Type::Brush | Type::Image | Type::Easing | Type::Array(_) => {
+        Type::Color
+        | Type::Brush
+        | Type::Image
+        | Type::Easing
+        | Type::StyledText
+        | Type::Array(_) => {
             Expression::StringLiteral("<debug-of-this-type-not-yet-implemented>".into())
         }
         Type::Duration

internal/compiler/expression_tree.rs

@@ -1427,6 +1427,7 @@ impl Expression {
                 Expression::EnumerationValue(enumeration.clone().default_value())
             }
             Type::ComponentFactory => Expression::EmptyComponentFactory,
+            Type::StyledText => Expression::Invalid,
         }
     }
 

internal/compiler/generator/rust.rs

@@ -91,6 +91,7 @@ pub fn rust_primitive_type(ty: &Type) -> Option<proc_macro2::TokenStream> {
         Type::Percent => Some(quote!(f32)),
         Type::Bool => Some(quote!(bool)),
         Type::Image => Some(quote!(sp::Image)),
+        Type::StyledText => Some(quote!(sp::StyledText)),
         Type::Struct(s) => {
             struct_name_to_tokens(&s.name).or_else(|| {
                 let elem =

internal/compiler/langtype.rs

@@ -64,6 +64,8 @@ pub enum Type {
 
     /// This is a `SharedArray<f32>`
     LayoutCache,
+
+    StyledText,
 }
 
 impl core::cmp::PartialEq for Type {
@@ -104,6 +106,7 @@ impl core::cmp::PartialEq for Type {
             Type::UnitProduct(a) => matches!(other, Type::UnitProduct(b) if a == b),
             Type::ElementReference => matches!(other, Type::ElementReference),
             Type::LayoutCache => matches!(other, Type::LayoutCache),
+            Type::StyledText => matches!(other, Type::StyledText),
         }
     }
 }
@@ -178,6 +181,7 @@ impl Display for Type {
             }
             Type::ElementReference => write!(f, "element ref"),
             Type::LayoutCache => write!(f, "layout cache"),
+            Type::StyledText => write!(f, "styled-text"),
         }
     }
 }
@@ -213,6 +217,7 @@ impl Type {
                 | Self::Array(_)
                 | Self::Brush
                 | Self::InferredProperty
+                | Self::StyledText
         )
     }
 
@@ -314,6 +319,7 @@ impl Type {
             Type::UnitProduct(_) => None,
             Type::ElementReference => None,
             Type::LayoutCache => None,
+            Type::StyledText => None,
         }
     }
 

internal/compiler/llr/expression.rs

@@ -267,6 +267,7 @@ impl Expression {
                 Expression::EnumerationValue(enumeration.clone().default_value())
             }
             Type::ComponentFactory => Expression::EmptyComponentFactory,
+            Type::StyledText => return None,
         })
     }
 

internal/compiler/typeregister.rs

@@ -397,6 +397,7 @@ impl TypeRegister {
         register.insert_type(Type::Angle);
         register.insert_type(Type::Brush);
         register.insert_type(Type::Rem);
+        register.insert_type(Type::StyledText);
         register.types.insert("Point".into(), logical_point_type().into());
 
         BUILTIN.with(|e| e.enums.fill_register(&mut register));