vrr/zed
2
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 05:51:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

ui: Fix panic in highlight_ranges when given an oob index (#39051)

Browse source 
Fixes ZED-1QW

Release Notes:

- Fixed a panic when highlighting labels
This commit is contained in:
Lukas Wirth 2025-09-28 13:54:18 +02:00 • committed by GitHub
parent 6d7a4c441b
commit 5ce7eda8d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ui/src/components/label/highlighted_label.rs
View file

@ -105,15 +105,10 @@ pub fn highlight_ranges(
let mut end_ix = start_ix;
loop {
end_ix = end_ix + text[end_ix..].chars().next().unwrap().len_utf8();
if let Some(&next_ix) = highlight_indices.peek()
&& next_ix == end_ix
{
end_ix = next_ix;
highlight_indices.next();
continue;
end_ix += text[end_ix..].chars().next().map_or(0, |c| c.len_utf8());
if highlight_indices.next_if(|&ix| ix == end_ix).is_none() {
break;
}
break;
}
highlights.push((start_ix..end_ix, style));