pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(terminal): recover from partial line drop (#3695)

Browse source
This commit is contained in:
Aram Drevekenin 2024-10-24 09:42:15 +02:00 • committed by GitHub
parent add1241c9e
commit bb781eafed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
zellij-server/src/panes/grid.rs
View file

@ -705,9 +705,17 @@ impl Grid {
let line_to_push_up = if line_to_push_up.is_canonical {
line_to_push_up
} else {
let mut last_line_above = self.lines_above.pop_back().unwrap();
last_line_above.append(&mut line_to_push_up.columns);
last_line_above
match self.lines_above.pop_back() {
Some(mut last_line_above) => {
last_line_above.append(&mut line_to_push_up.columns);
last_line_above
},
None => {
// in this case, this line was not canonical but its beginning line was
// dropped out of scope, so we make it canonical and push it up
line_to_push_up.canonical()
},
}
};
let dropped_line_width =