github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-12-01 15:14:26 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix reformat_for_screen

Browse Source 
This had an infinite loop because it had two checks broken
This commit is contained in:
Fabian Boehm 2023-08-13 11:42:18 +02:00
parent ee8e790aa7
commit b75f901376
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fish-rust/src/common.rs
View File

@ -1548,7 +1548,7 @@ pub fn reformat_for_screen(msg: &wstr, termsize: &Termsize) -> WString {
let mut tok_width = 0; let mut tok_width = 0;
// Tokenize on whitespace, and also calculate the width of the token. // Tokenize on whitespace, and also calculate the width of the token.
while pos < msg.len() && [' ', '\n', '\r', '\t'].contains(&msg.char_at(pos)) { while pos < msg.len() && ![' ', '\n', '\r', '\t'].contains(&msg.char_at(pos)) {
// Check is token is wider than one line. If so we mark it as an overflow and break // Check is token is wider than one line. If so we mark it as an overflow and break
// the token. // the token.
let width = fish_wcwidth(msg.char_at(pos).into()).0 as isize; let width = fish_wcwidth(msg.char_at(pos).into()).0 as isize;
@ -1561,7 +1561,7 @@ pub fn reformat_for_screen(msg: &wstr, termsize: &Termsize) -> WString {
} }
// If token is zero character long, we don't do anything. // If token is zero character long, we don't do anything.
if pos == 0 { if pos == start {
pos += 1; pos += 1;
} else if overflow { } else if overflow {
// In case of overflow, we print a newline, except if we already are at position 0. // In case of overflow, we print a newline, except if we already are at position 0.