archives/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-03-08 02:44:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Progress: Emit \r\n on Windows, include new line bytes in line_upper_bound_len

Browse source 
The \r\n is necessary to get the progress tree to work properly in the old console when ENABLE_VIRTUAL_TERMINAL_PROCESSING and DISABLE_NEWLINE_AUTO_RETURN are set.

The line_upper_bound_len fix addresses part of #20161
This commit is contained in:
Ryan Liptak 2024-06-02 04:06:49 -07:00 • committed by Andrew Kelley
parent 5e1ccd96e5
commit 2cf8e73781
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/std/Progress.zig
View file

@ -1133,8 +1133,10 @@ fn computePrefix(
return i;
}
// \r\n on Windows, \n otherwise.
const nl_len = if (is_windows) 2 else 1;
const line_upper_bound_len = @max(TreeSymbol.tee.maxByteLen(), TreeSymbol.langle.maxByteLen()) +
"[4294967296/4294967296] ".len + Node.max_name_len + (1 + up_one_line.len) + finish_sync.len;
"[4294967296/4294967296] ".len + Node.max_name_len + nl_len + (1 + up_one_line.len) + finish_sync.len;
fn computeNode(
buf: []u8,
@ -1183,6 +1185,13 @@ fn computeNode(
}
i = @min(global_progress.cols + start_i, i);
if (is_windows) {
// \r\n on Windows is necessary for the old console with the
// ENABLE_VIRTUAL_TERMINAL_PROCESSING | DISABLE_NEWLINE_AUTO_RETURN
// console modes set to behave properly.
buf[i] = '\r';
i += 1;
}
buf[i] = '\n';
i += 1;
nl_n += 1;