From 09c51f96413593b4ccead1dfe40404b5d28a282a Mon Sep 17 00:00:00 2001
From: 0x2CA <2478557459@qq.com>
Date: Fri, 7 Mar 2025 10:14:53 +0800
Subject: [PATCH] assistant2: Fix font fallbacks (#26258)

Release Notes:

- N/A
---
 crates/assistant2/src/active_thread.rs  | 6 ++++++
 crates/assistant2/src/message_editor.rs | 1 +
 2 files changed, 7 insertions(+)

diff --git a/crates/assistant2/src/active_thread.rs b/crates/assistant2/src/active_thread.rs
index b9f53190a8..1696305a71 100644
--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -173,6 +173,8 @@ impl ActiveThread {
 
         text_style.refine(&TextStyleRefinement {
             font_family: Some(theme_settings.ui_font.family.clone()),
+            font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
+            font_features: Some(theme_settings.ui_font.features.clone()),
             font_size: Some(ui_font_size.into()),
             color: Some(cx.theme().colors().text),
             ..Default::default()
@@ -207,6 +209,8 @@ impl ActiveThread {
                 },
                 text: Some(TextStyleRefinement {
                     font_family: Some(theme_settings.buffer_font.family.clone()),
+                    font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
+                    font_features: Some(theme_settings.buffer_font.features.clone()),
                     font_size: Some(buffer_font_size.into()),
                     ..Default::default()
                 }),
@@ -214,6 +218,8 @@ impl ActiveThread {
             },
             inline_code: TextStyleRefinement {
                 font_family: Some(theme_settings.buffer_font.family.clone()),
+                font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
+                font_features: Some(theme_settings.buffer_font.features.clone()),
                 font_size: Some(buffer_font_size.into()),
                 background_color: Some(colors.editor_foreground.opacity(0.1)),
                 ..Default::default()
diff --git a/crates/assistant2/src/message_editor.rs b/crates/assistant2/src/message_editor.rs
index 9dcf411081..d450536f43 100644
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -389,6 +389,7 @@ impl Render for MessageEditor {
                                 let text_style = TextStyle {
                                     color: cx.theme().colors().text,
                                     font_family: settings.ui_font.family.clone(),
+                                    font_fallbacks: settings.ui_font.fallbacks.clone(),
                                     font_features: settings.ui_font.features.clone(),
                                     font_size: font_size.into(),
                                     font_weight: settings.ui_font.weight,