Merge with master

[autofix.ci] apply automated fixes

Fix api/node

Don't use std:: for certain types

Move test

Fix testing backend thing

Add allow missing docs to stuff

Change rendertext trait to use enum

Fill out styled text type

Apply automated fixes

Add comments and solve warnings

Rename MarkdownText to StyledText

[autofix.ci] apply automated fixes

Implement more things

add StyledText Type and Value

Author: expenses

api/cpp/cbindgen.rs

@@ -305,7 +305,7 @@ fn gen_corelib(
         "Flickable",
         "SimpleText",
         "ComplexText",
-        "MarkdownText",
+        "StyledText",
         "Path",
         "WindowItem",
         "TextInput",

internal/backends/qt/qt_window.rs

@@ -686,6 +686,16 @@ impl ItemRenderer for QtItemRenderer<'_> {
         sharedparley::draw_text(self, text, Some(self_rc), size);
     }
 
+    fn draw_styled_text(
+        &mut self,
+        text: Pin<&i_slint_core::items::StyledText>,
+        self_rc: &ItemRc,
+        size: LogicalSize,
+        _cache: &CachedRenderingData,
+    ) {
+        sharedparley::draw_styled_text(self, text, Some(self_rc), size);
+    }
+
     fn draw_text_input(
         &mut self,
         text_input: Pin<&items::TextInput>,
@@ -2095,6 +2105,16 @@ impl i_slint_core::renderer::RendererSealed for QtWindow {
         sharedparley::text_size(self, text_item, item_rc, max_width, text_wrap)
     }
 
+    fn styled_text_size(
+        &self,
+        text_item: Pin<&i_slint_core::items::StyledText>,
+        item_rc: &ItemRc,
+        max_width: Option<LogicalLength>,
+        text_wrap: TextWrap,
+    ) -> LogicalSize {
+        sharedparley::styled_text_size(self, text_item, item_rc, max_width, text_wrap)
+    }
+
     fn char_size(
         &self,
         text_item: Pin<&dyn i_slint_core::item_rendering::HasFont>,

internal/backends/testing/testing_backend.rs

@@ -3,6 +3,7 @@
 
 use i_slint_core::api::PhysicalSize;
 use i_slint_core::graphics::euclid::{Point2D, Size2D};
+use i_slint_core::item_rendering::PlainOrStyledText;
 use i_slint_core::lengths::{LogicalLength, LogicalPoint, LogicalRect, LogicalSize};
 use i_slint_core::platform::PlatformError;
 use i_slint_core::renderer::{Renderer, RendererSealed};
@@ -164,7 +165,11 @@ impl RendererSealed for TestingWindow {
         _max_width: Option<LogicalLength>,
         _text_wrap: TextWrap,
     ) -> LogicalSize {
-        LogicalSize::new(text_item.text().len() as f32 * 10., 10.)
+        if let PlainOrStyledText::Plain(text) = text_item.text() {
+            LogicalSize::new(text.len() as f32 * 10., 10.)
+        } else {
+            Default::default()
+        }
     }
 
     fn char_size(

internal/compiler/builtin_macros.rs

@@ -425,6 +425,7 @@ fn to_debug_string(
             }
         }
         Type::Enumeration(_) => Expression::Cast { from: Box::new(expr), to: (Type::String) },
+        Type::StyledText => Expression::Invalid,
     }
 }
 

internal/compiler/builtins.slint

@@ -120,18 +120,17 @@ component ComplexText inherits SimpleText {
 
 export { ComplexText as Text }
 
-export component MarkdownText inherits Empty {
+export component StyledText inherits Empty {
     in property <length> width;
     in property <length> height;
-    in property <string> text;
+    in property <styled-text> text;
     in property <length> font-size;
     in property <int> font-weight;
     in property <brush> color;
     in property <TextHorizontalAlignment> horizontal-alignment;
     in property <TextVerticalAlignment> vertical-alignment;
     callback link-clicked(link: string);
     in property <color> link-color: #00f;
-
     in property <string> font-family;
     in property <bool> font-italic;
     in property <TextOverflow> overflow;
@@ -143,6 +142,10 @@ export component MarkdownText inherits Empty {
     //-default_size_binding:implicit_size
 }
 
+export component StyledText inherits Empty {
+    in property <styled-text> text;
+}
+
 export component TouchArea {
     in property <bool> enabled: true;
     out property <bool> pressed;

internal/compiler/expression_tree.rs

@@ -277,7 +277,7 @@ declare_builtin_function_types!(
     RestartTimer: (Type::ElementReference) -> Type::Void,
     OpenUrl: (Type::String) -> Type::Void,
     EscapeMarkdown: (Type::String) -> Type::String,
-    ParseMarkdown: (Type::String) -> Type::String
+    ParseMarkdown: (Type::String) -> Type::StyledText
 );
 
 impl BuiltinFunction {
@@ -374,7 +374,7 @@ impl BuiltinFunction {
             BuiltinFunction::StopTimer => false,
             BuiltinFunction::RestartTimer => false,
             BuiltinFunction::OpenUrl => false,
-            BuiltinFunction::ParseMarkdown | BuiltinFunction::EscapeMarkdown => true,
+            BuiltinFunction::ParseMarkdown | BuiltinFunction::EscapeMarkdown => false,
         }
     }
 

internal/compiler/passes/apply_default_properties_from_style.rs

@@ -62,7 +62,7 @@ pub fn apply_default_properties_from_style(
                         }
                     });
                 }
-                "Text" | "MarkdownText" => {
+                "Text" | "StyledText" => {
                     elem.set_binding_if_not_set("color".into(), || Expression::Cast {
                         from: Expression::PropertyReference(NamedReference::new(
                             &palette.root_element,

internal/compiler/passes/embed_glyphs.rs

@@ -546,7 +546,7 @@ pub fn collect_font_sizes_used(
         .to_string()
         .as_str()
     {
-        "TextInput" | "Text" | "SimpleText" | "ComplexText" | "MarkdownText" => {
+        "TextInput" | "Text" | "SimpleText" | "ComplexText" | "StyledText" => {
             if let Some(font_size) = try_extract_font_size_from_element(elem, "font-size") {
                 add_font_size(font_size)
             }

internal/compiler/passes/resolving.rs

@@ -848,8 +848,9 @@ impl Expression {
                 pos = end + 1;
                 literal_start_pos = pos;
             }
-            {
-                let trailing = Expression::StringLiteral((&string[literal_start_pos..]).into());
+            let trailing = &string[literal_start_pos..];
+            if !trailing.is_empty() {
+                let trailing = Expression::StringLiteral(trailing.into());
                 expr = Some(match expr {
                     None => trailing,
                     Some(expr) => Expression::BinaryExpression {
@@ -876,7 +877,7 @@ impl Expression {
         Expression::FunctionCall {
             function: BuiltinFunction::ParseMarkdown.into(),
             arguments: vec![
-                expr.unwrap_or_else(|| Expression::default_value_for_type(&Type::String))
+                expr.unwrap_or_else(|| Expression::default_value_for_type(&Type::String)),
             ],
             source_location: Some(node.to_source_location()),
         }

internal/compiler/typeregister.rs

@@ -586,7 +586,7 @@ impl TypeRegister {
         register.elements.remove("DropArea").unwrap();
         register.types.remove("DropEvent").unwrap(); // Also removed in xtask/src/slintdocs.rs
 
-        register.elements.remove("MarkdownText").unwrap();
+        register.elements.remove("StyledText").unwrap();
 
         Rc::new(RefCell::new(register))
     }