Merge with master

expenses · expenses · commit b004797efd17 · 2025-11-21T15:08:47.000+01:00
diff --git a/api/cpp/cbindgen.rs b/api/cpp/cbindgen.rs
@@ -305,7 +305,6 @@ fn gen_corelib(
         "Flickable",
         "SimpleText",
         "ComplexText",
-        "MarkdownText",
         "Path",
         "WindowItem",
         "TextInput",
diff --git a/internal/backends/testing/testing_backend.rs b/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(
diff --git a/internal/compiler/builtins.slint b/internal/compiler/builtins.slint
@@ -120,10 +120,10 @@ component ComplexText inherits SimpleText {
 
 export { ComplexText as Text }
 
-export component MarkdownText inherits Empty {
+component StyledTextItem 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;
@@ -143,6 +143,8 @@ export component MarkdownText inherits Empty {
     //-default_size_binding:implicit_size
 }
 
+export { StyledTextItem as StyledText }
+
 export component TouchArea {
     in property <bool> enabled: true;
     out property <bool> pressed;
diff --git a/internal/compiler/expression_tree.rs b/internal/compiler/expression_tree.rs
@@ -114,6 +114,8 @@ pub enum BuiltinFunction {
     StopTimer,
     RestartTimer,
     OpenUrl,
+    ParseMarkdown,
+    EscapeMarkdown,
 }
 
 #[derive(Debug, Clone)]
@@ -273,7 +275,9 @@ declare_builtin_function_types!(
     StartTimer: (Type::ElementReference) -> Type::Void,
     StopTimer: (Type::ElementReference) -> Type::Void,
     RestartTimer: (Type::ElementReference) -> Type::Void,
-    OpenUrl: (Type::String) -> Type::Void
+    OpenUrl: (Type::String) -> Type::Void,
+    EscapeMarkdown: (Type::String) -> Type::String,
+    ParseMarkdown: (Type::String) -> Type::StyledText
 );
 
 impl BuiltinFunction {
@@ -370,6 +374,7 @@ impl BuiltinFunction {
             BuiltinFunction::StopTimer => false,
             BuiltinFunction::RestartTimer => false,
             BuiltinFunction::OpenUrl => false,
+            BuiltinFunction::ParseMarkdown | BuiltinFunction::EscapeMarkdown => false,
         }
     }
 
@@ -448,6 +453,7 @@ impl BuiltinFunction {
             BuiltinFunction::StopTimer => false,
             BuiltinFunction::RestartTimer => false,
             BuiltinFunction::OpenUrl => false,
+            BuiltinFunction::ParseMarkdown | BuiltinFunction::EscapeMarkdown => true,
         }
     }
 }
diff --git a/internal/compiler/generator/cpp.rs b/internal/compiler/generator/cpp.rs
@@ -4213,6 +4213,14 @@ fn compile_builtin_function_call(
             let url = a.next().unwrap();
             format!("slint::cbindgen_private::open_url({})", url)
         }
+        BuiltinFunction::EscapeMarkdown => {
+            let text = a.next().unwrap();
+            format!("slint::cbindgen_private::escape_markdown({})", text)
+        }
+        BuiltinFunction::ParseMarkdown => {
+            let text = a.next().unwrap();
+            format!("slint::cbindgen_private::parse_markdown({})", text)
+        }
     }
 }
 
diff --git a/internal/compiler/generator/rust.rs b/internal/compiler/generator/rust.rs
@@ -3383,6 +3383,14 @@ fn compile_builtin_function_call(
             let url = a.next().unwrap();
             quote!(sp::open_url(&#url))
         }
+        BuiltinFunction::EscapeMarkdown => {
+            let text = a.next().unwrap();
+            quote!(sp::escape_markdown(&#text))
+        }
+        BuiltinFunction::ParseMarkdown => {
+            let text = a.next().unwrap();
+            quote!(sp::parse_markdown(&#text))
+        }
     }
 }
 
diff --git a/internal/compiler/llr/optim_passes/inline_expressions.rs b/internal/compiler/llr/optim_passes/inline_expressions.rs
@@ -155,6 +155,7 @@ fn builtin_function_cost(function: &BuiltinFunction) -> isize {
         BuiltinFunction::StopTimer => 10,
         BuiltinFunction::RestartTimer => 10,
         BuiltinFunction::OpenUrl => isize::MAX,
+        BuiltinFunction::ParseMarkdown | BuiltinFunction::EscapeMarkdown => isize::MAX,
     }
 }
 
diff --git a/internal/compiler/parser.rs b/internal/compiler/parser.rs
@@ -383,6 +383,7 @@ declare_syntax! {
         AtGradient -> [*Expression],
         /// `@tr("foo", ...)`  // the string is a StringLiteral
         AtTr -> [?TrContext, ?TrPlural, *Expression],
+        AtMarkdown -> [*Expression],
         /// `"foo" =>`  in a `AtTr` node
         TrContext -> [],
         /// `| "foo" % n`  in a `AtTr` node
diff --git a/internal/compiler/parser/expressions.rs b/internal/compiler/parser/expressions.rs
@@ -255,6 +255,9 @@ fn parse_at_keyword(p: &mut impl Parser) {
         "tr" => {
             parse_tr(p);
         }
+        "markdown" => {
+            parse_markdown(p);
+        }
         _ => {
             p.consume();
             p.test(SyntaxKind::Identifier); // consume the identifier, so that autocomplete works
@@ -438,6 +441,37 @@ fn parse_tr(p: &mut impl Parser) {
     p.expect(SyntaxKind::RParent);
 }
 
+fn parse_markdown(p: &mut impl Parser) {
+    let mut p = p.start_node(SyntaxKind::AtMarkdown);
+    p.expect(SyntaxKind::At);
+    debug_assert!(p.peek().as_str().ends_with("markdown"));
+    p.expect(SyntaxKind::Identifier); //eg "markdown"
+    p.expect(SyntaxKind::LParent);
+
+    fn consume_literal(p: &mut impl Parser) -> bool {
+        let peek = p.peek();
+        if peek.kind() != SyntaxKind::StringLiteral
+            || !peek.as_str().starts_with('"')
+            || !peek.as_str().ends_with('"')
+        {
+            p.error("Expected plain string literal");
+            return false;
+        }
+        p.expect(SyntaxKind::StringLiteral)
+    }
+
+    if !consume_literal(&mut *p) {
+        return;
+    }
+
+    while p.test(SyntaxKind::Comma) {
+        if !parse_expression(&mut *p) {
+            break;
+        }
+    }
+    p.expect(SyntaxKind::RParent);
+}
+
 #[cfg_attr(test, parser_test)]
 /// ```test,AtImageUrl
 /// @image-url("foo.png")
diff --git a/internal/compiler/passes/apply_default_properties_from_style.rs b/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,
diff --git a/internal/compiler/passes/embed_glyphs.rs b/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)
             }
diff --git a/internal/compiler/passes/resolving.rs b/internal/compiler/passes/resolving.rs
@@ -359,6 +359,7 @@ impl Expression {
                     SyntaxKind::AtImageUrl => Some(Self::from_at_image_url_node(node.into(), ctx)),
                     SyntaxKind::AtGradient => Some(Self::from_at_gradient(node.into(), ctx)),
                     SyntaxKind::AtTr => Some(Self::from_at_tr(node.into(), ctx)),
+                    SyntaxKind::AtMarkdown => Some(Self::from_at_markdown(node.into(), ctx)),
                     SyntaxKind::QualifiedName => Some(Self::from_qualified_name_node(
                         node.clone().into(),
                         ctx,
@@ -745,6 +746,143 @@ impl Expression {
         }
     }
 
+    fn from_at_markdown(node: syntax_nodes::AtMarkdown, ctx: &mut LookupCtx) -> Expression {
+        let Some(string) = node
+            .child_text(SyntaxKind::StringLiteral)
+            .and_then(|s| crate::literals::unescape_string(&s))
+        else {
+            ctx.diag.push_error("Cannot parse string literal".into(), &node);
+            return Expression::Invalid;
+        };
+
+        let subs = node.Expression().map(|n| {
+            Expression::from_expression_node(n.clone(), ctx).maybe_convert_to(
+                Type::String,
+                &n,
+                ctx.diag,
+            )
+        });
+        let values = subs.collect::<Vec<_>>();
+
+        let mut expr = None;
+
+        // check format string
+        {
+            let mut arg_idx = 0;
+            let mut pos_max = 0;
+            let mut pos = 0;
+            let mut literal_start_pos = 0;
+            while let Some(mut p) = string[pos..].find(['{', '}']) {
+                if string.len() - pos < p + 1 {
+                    ctx.diag.push_error(
+                        "Unescaped trailing '{' in format string. Escape '{' with '{{'".into(),
+                        &node,
+                    );
+                    break;
+                }
+                p += pos;
+
+                // Skip escaped }
+                if string.get(p..=p) == Some("}") {
+                    if string.get(p + 1..=p + 1) == Some("}") {
+                        pos = p + 2;
+                        continue;
+                    } else {
+                        ctx.diag.push_error(
+                            "Unescaped '}' in format string. Escape '}' with '}}'".into(),
+                            &node,
+                        );
+                        break;
+                    }
+                }
+
+                // Skip escaped {
+                if string.get(p + 1..=p + 1) == Some("{") {
+                    pos = p + 2;
+                    continue;
+                }
+
+                // Find the argument
+                let end = if let Some(end) = string[p..].find('}') {
+                    end + p
+                } else {
+                    ctx.diag.push_error(
+                        "Unterminated placeholder in format string. '{' must be escaped with '{{'"
+                            .into(),
+                        &node,
+                    );
+                    break;
+                };
+                let argument = &string[p + 1..end];
+                let argument_index = if argument.is_empty() {
+                    let argument_index = arg_idx;
+                    arg_idx += 1;
+                    argument_index
+                } else if let Ok(n) = argument.parse::<u16>() {
+                    pos_max = pos_max.max(n as usize + 1);
+                    n as usize
+                } else {
+                    ctx.diag
+                        .push_error("Invalid '{...}' placeholder in format string. The placeholder must be a number, or braces must be escaped with '{{' and '}}'".into(), &node);
+                    break;
+                };
+                let add = Expression::BinaryExpression {
+                    lhs: Box::new(Expression::StringLiteral(
+                        (&string[literal_start_pos..p]).into(),
+                    )),
+                    op: '+',
+                    rhs: Box::new(Expression::FunctionCall {
+                        function: BuiltinFunction::EscapeMarkdown.into(),
+                        arguments: vec![values[argument_index].clone()],
+                        source_location: Some(node.to_source_location()),
+                    }),
+                };
+                expr = Some(match expr {
+                    None => add,
+                    Some(expr) => Expression::BinaryExpression {
+                        lhs: Box::new(expr),
+                        op: '+',
+                        rhs: Box::new(add),
+                    },
+                });
+                pos = end + 1;
+                literal_start_pos = pos;
+            }
+            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 {
+                        lhs: Box::new(expr),
+                        op: '+',
+                        rhs: Box::new(trailing),
+                    },
+                });
+            }
+            if arg_idx > 0 && pos_max > 0 {
+                ctx.diag.push_error(
+                    "Cannot mix positional and non-positional placeholder in format string".into(),
+                    &node,
+                );
+            } else if arg_idx > values.len() || pos_max > values.len() {
+                let num = arg_idx.max(pos_max);
+                ctx.diag.push_error(
+                    format!("Format string contains {num} placeholders, but only {} extra arguments were given", values.len()),
+                    &node,
+                );
+            }
+        }
+
+        Expression::FunctionCall {
+            function: BuiltinFunction::ParseMarkdown.into(),
+            arguments: vec![
+                expr.unwrap_or_else(|| Expression::default_value_for_type(&Type::String)),
+            ],
+            source_location: Some(node.to_source_location()),
+        }
+    }
+
     fn from_at_tr(node: syntax_nodes::AtTr, ctx: &mut LookupCtx) -> Expression {
         let Some(string) = node
             .child_text(SyntaxKind::StringLiteral)
diff --git a/internal/compiler/typeregister.rs b/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))
     }
diff --git a/internal/core/item_rendering.rs b/internal/core/item_rendering.rs
@@ -296,10 +296,16 @@ pub trait HasFont {
     fn font_request(self: Pin<&Self>, self_rc: &crate::items::ItemRc) -> FontRequest;
 }
 
+#[allow(missing_docs)]
+pub enum PlainOrStyledText {
+    Plain(SharedString),
+    Styled(crate::api::StyledText),
+}
+
 /// Trait for an item that represents an string towards the renderer
 #[allow(missing_docs)]
 pub trait RenderString: HasFont {
-    fn text(self: Pin<&Self>) -> SharedString;
+    fn text(self: Pin<&Self>) -> PlainOrStyledText;
 }
 
 /// Trait for an item that represents an Text towards the renderer
@@ -329,8 +335,8 @@ impl HasFont for (SharedString, Brush) {
 }
 
 impl RenderString for (SharedString, Brush) {
-    fn text(self: Pin<&Self>) -> SharedString {
-        self.0.clone()
+    fn text(self: Pin<&Self>) -> PlainOrStyledText {
+        PlainOrStyledText::Plain(self.0.clone())
     }
 }
 
diff --git a/internal/core/items.rs b/internal/core/items.rs
@@ -1729,7 +1729,7 @@ declare_item_vtable! {
 }
 
 declare_item_vtable! {
-    fn slint_get_MarkdownTextVTable() -> MarkdownTextVTable for MarkdownText
+    fn slint_get_StyledTextItemVTable() -> StyledTextItemVTable for StyledTextItem
 }
 
 declare_item_vtable! {
diff --git a/internal/core/items/text.rs b/internal/core/items/text.rs
diff --git a/internal/core/lib.rs b/internal/core/lib.rs
diff --git a/internal/core/software_renderer.rs b/internal/core/software_renderer.rs
diff --git a/internal/core/textlayout/sharedparley.rs b/internal/core/textlayout/sharedparley.rs
diff --git a/internal/interpreter/api.rs b/internal/interpreter/api.rs
diff --git a/internal/interpreter/dynamic_item_tree.rs b/internal/interpreter/dynamic_item_tree.rs
diff --git a/internal/interpreter/eval.rs b/internal/interpreter/eval.rs

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,8 @@ pub enum BuiltinFunction {`
`114`	`114`	`StopTimer,`
`115`	`115`	`RestartTimer,`
`116`	`116`	`OpenUrl,`
	`117`	`+ ParseMarkdown,`
	`118`	`+ EscapeMarkdown,`
`117`	`119`	`}`
`118`	`120`
`119`	`121`	`#[derive(Debug, Clone)]`
`@@ -273,7 +275,9 @@ declare_builtin_function_types!(`
`273`	`275`	`StartTimer: (Type::ElementReference) -> Type::Void,`
`274`	`276`	`StopTimer: (Type::ElementReference) -> Type::Void,`
`275`	`277`	`RestartTimer: (Type::ElementReference) -> Type::Void,`
`276`		`- OpenUrl: (Type::String) -> Type::Void`
	`278`	`+ OpenUrl: (Type::String) -> Type::Void,`
	`279`	`+ EscapeMarkdown: (Type::String) -> Type::String,`
	`280`	`+ ParseMarkdown: (Type::String) -> Type::StyledText`
`277`	`281`	`);`
`278`	`282`
`279`	`283`	`impl BuiltinFunction {`
`@@ -370,6 +374,7 @@ impl BuiltinFunction {`
`370`	`374`	`BuiltinFunction::StopTimer => false,`
`371`	`375`	`BuiltinFunction::RestartTimer => false,`
`372`	`376`	`BuiltinFunction::OpenUrl => false,`
	`377`	`+ BuiltinFunction::ParseMarkdown \| BuiltinFunction::EscapeMarkdown => false,`
`373`	`378`	`}`
`374`	`379`	`}`
`375`	`380`
`@@ -448,6 +453,7 @@ impl BuiltinFunction {`
`448`	`453`	`BuiltinFunction::StopTimer => false,`
`449`	`454`	`BuiltinFunction::RestartTimer => false,`
`450`	`455`	`BuiltinFunction::OpenUrl => false,`
	`456`	`+ BuiltinFunction::ParseMarkdown \| BuiltinFunction::EscapeMarkdown => true,`
`451`	`457`	`}`
`452`	`458`	`}`
`453`	`459`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4213,6 +4213,14 @@ fn compile_builtin_function_call(`
`4213`	`4213`	`let url = a.next().unwrap();`
`4214`	`4214`	`format!("slint::cbindgen_private::open_url({})", url)`
`4215`	`4215`	`}`
	`4216`	`+ BuiltinFunction::EscapeMarkdown => {`
	`4217`	`+ let text = a.next().unwrap();`
	`4218`	`+ format!("slint::cbindgen_private::escape_markdown({})", text)`
	`4219`	`+ }`
	`4220`	`+ BuiltinFunction::ParseMarkdown => {`
	`4221`	`+ let text = a.next().unwrap();`
	`4222`	`+ format!("slint::cbindgen_private::parse_markdown({})", text)`
	`4223`	`+ }`
`4216`	`4224`	`}`
`4217`	`4225`	`}`
`4218`	`4226`
Original file line number	Diff line number	Diff line change
`@@ -3383,6 +3383,14 @@ fn compile_builtin_function_call(`
`3383`	`3383`	`let url = a.next().unwrap();`
`3384`	`3384`	`quote!(sp::open_url(&#url))`
`3385`	`3385`	`}`
	`3386`	`+ BuiltinFunction::EscapeMarkdown => {`
	`3387`	`+ let text = a.next().unwrap();`
	`3388`	`+ quote!(sp::escape_markdown(&#text))`
	`3389`	`+ }`
	`3390`	`+ BuiltinFunction::ParseMarkdown => {`
	`3391`	`+ let text = a.next().unwrap();`
	`3392`	`+ quote!(sp::parse_markdown(&#text))`
	`3393`	`+ }`
`3386`	`3394`	`}`
`3387`	`3395`	`}`
`3388`	`3396`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ fn builtin_function_cost(function: &BuiltinFunction) -> isize {`
`155`	`155`	`BuiltinFunction::StopTimer => 10,`
`156`	`156`	`BuiltinFunction::RestartTimer => 10,`
`157`	`157`	`BuiltinFunction::OpenUrl => isize::MAX,`
	`158`	`+ BuiltinFunction::ParseMarkdown \| BuiltinFunction::EscapeMarkdown => isize::MAX,`
`158`	`159`	`}`
`159`	`160`	`}`
`160`	`161`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ pub fn apply_default_properties_from_style(`
`62`	`62`	`}`
`63`	`63`	`});`
`64`	`64`	`}`
`65`		`- "Text" \| "MarkdownText" => {`
	`65`	`+ "Text" \| "StyledText" => {`
`66`	`66`	`elem.set_binding_if_not_set("color".into(), \|\| Expression::Cast {`
`67`	`67`	`from: Expression::PropertyReference(NamedReference::new(`
`68`	`68`	`&palette.root_element,`