Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 13:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix regression causing crash when we should clamp negative wcwidth

Browse source 
Fixes c41dbe455 (Also use control pictures for pager prefix,
2024-10-19).

Fixes #10836
This commit is contained in:
Johannes Altmanninger 2024-11-07 07:26:44 +01:00
parent 373c5b1e14
commit 5e3fdf3320
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/screen.rs
View file

@ -1953,11 +1953,11 @@ fn rendered_character(c: char) -> char {
} }
fn wcwidth_rendered_min_0(c: char) -> usize { fn wcwidth_rendered_min_0(c: char) -> usize {
usize::try_from(wcwidth_rendered(c)).unwrap() usize::try_from(wcwidth_rendered(c)).unwrap_or_default()
} }
pub fn wcwidth_rendered(c: char) -> isize { pub fn wcwidth_rendered(c: char) -> isize {
fish_wcwidth(rendered_character(c)) fish_wcwidth(rendered_character(c))
} }
pub fn wcswidth_rendered(s: &wstr) -> isize { pub fn wcswidth_rendered(s: &wstr) -> isize {
s.chars().map(|c| fish_wcwidth(rendered_character(c))).sum() s.chars().map(wcwidth_rendered).sum()
} }