From 49f6a8ba69764e99d6674147cd716e32254dfc30 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sat, 20 Nov 2021 01:24:14 -0500 Subject: make sure all of these cases are handled the same --- src/row.rs | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/row.rs b/src/row.rs index 3b0302c..7b3c2f0 100644 --- a/src/row.rs +++ b/src/row.rs @@ -267,7 +267,13 @@ impl Row { && prev_pos.row + 1 == new_pos.row && prev_pos.col >= self.cols() { - contents.extend(" ".repeat(new_pos.col as usize).as_bytes()); + if new_pos.col > 0 { + contents + .extend(" ".repeat(new_pos.col as usize).as_bytes()); + } else { + contents.extend(b" "); + crate::term::Backspace::default().write_buf(contents); + } } else { crate::term::MoveFromTo::new(prev_pos, new_pos) .write_buf(contents); @@ -430,8 +436,21 @@ impl Row { } if let Some((prev_col, attrs)) = erase { let new_pos = crate::grid::Pos { row, col: prev_col }; - crate::term::MoveFromTo::new(prev_pos, new_pos) - .write_buf(contents); + if wrapping + && prev_pos.row + 1 == new_pos.row + && prev_pos.col >= self.cols() + { + if new_pos.col > 0 { + contents + .extend(" ".repeat(new_pos.col as usize).as_bytes()); + } else { + contents.extend(b" "); + crate::term::Backspace::default().write_buf(contents); + } + } else { + crate::term::MoveFromTo::new(prev_pos, new_pos) + .write_buf(contents); + } prev_pos = new_pos; if &prev_attrs != attrs { attrs.write_escape_code_diff(contents, &prev_attrs); -- cgit v1.2.3-54-g00ecf