nushell/reedline
1
1
Fork 0
mirror of https://github.com/nushell/reedline.git synced 2024-08-17 20:00:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: prompt position on resize (#578)

Browse Source 
* fix: prompt position on resize

* fix: u16 overflow

* fix: prompt position when terminal grows in height

* fix: exclude blank area from prompt height

fix: resume the early return to exclude a case where the terminal got smaller but the prompt is still visible

* fix: prevent any line overwriting at the cost of duplicate prompts

* fix: prevent width change from eating previous output
This commit is contained in:
IchHabeKeineNamen 2023-05-25 07:07:44 +08:00 committed by GitHub
parent 7f54706cab
commit bd306945b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/painting/painter.rs
View File

@ -405,22 +405,27 @@ impl Painter {
let prev_prompt_row = self.prompt_start_row;
self.terminal_size = (width, height);
// TODO properly adjusting prompt_origin on resizing while lines > 1
if prev_prompt_row >= (height - 1) {
// Terminal is shrinking up
// FIXME: use actual prompt size at some point
// Note: you can't just subtract the offset from the origin,
// as we could be shrinking so fast that the offset we read back from
// crossterm is past where it would have been.
self.prompt_start_row = height - 2;
} else if prev_terminal_size.1 < height {
// Terminal is growing down, so move the prompt down the same amount to make space
// for history that's on the screen
// Note: if the terminal doesn't have sufficient history, this will leave a trail
// of previous prompts currently.
self.prompt_start_row = prev_prompt_row + (height - prev_terminal_size.1);
if prev_prompt_row < height
&& height <= prev_terminal_size.1
&& width == prev_terminal_size.0
{
// The terminal got smaller in height but the start of the prompt is still visible
// The width didn't change
return;
}
// Either:
// - The terminal got larger in height
// - Note: if the terminal doesn't have sufficient history, this will leave a trail
// of previous prompts currently.
// - Note: if the the prompt contains multiple lines, this will leave a trail of
// previous prompts currently.
// - The terminal got smaller in height and the whole prompt is no longer visible
// - Note: if the the prompt contains multiple lines, this will leave a trail of
// previous prompts currently.
// - The width changed
self.prompt_start_row = height.saturating_sub(1);
}
/// Writes `line` to the terminal with a following carriage return and newline