vrr/zed
2
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-05-29 19:14:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

ui: Fix LoadingLabel animation panic on CJK/emoji text (#45632)

Browse source 
This PR fixes a crash in LoadingLabel where the loading animation
progressively revealed text by slicing with byte offsets (.len()), which
can panic for UTF-8 multi-byte characters (e.g., CJK) and emoji.

Release Notes:

- Fix a crash in LoadingLabel’s loading animation when displaying CJK or
emoji text.
This commit is contained in:
MomentDerek 2026-01-23 23:21:09 +08:00 • committed by GitHub
parent e1c80f4706
commit 4efe93cfbf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/ui/src/components/label/loading_label.rs
View file

@ -93,14 +93,15 @@ impl RenderOnce for LoadingLabel {
move |mut label, animation_ix, delta| {
match animation_ix {
0 => {
let chars_to_show = (delta * text.len() as f32).ceil() as usize;
let text = SharedString::from(text[0..chars_to_show].to_string());
label.set_text(text);
let byte_end =
text.floor_char_boundary((delta * text.len() as f32).ceil() as usize);
let visible_text = SharedString::new(&text[0..byte_end]);
label.set_text(visible_text);
}
1 => match delta {
d if d < 0.25 => label.set_text(text.clone()),
d if d < 0.5 => label.set_text(format!("{}.", text)),
d if d < 0.75 => label.set_text(format!("{}..", text)),
..0.25 => label.set_text(text.clone()),
..0.5 => label.set_text(format!("{}.", text)),
..0.75 => label.set_text(format!("{}..", text)),
_ => label.set_text(format!("{}...", text)),
},
_ => {}