diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig index b9d48af33..025167d74 100644 --- a/src/terminal/Terminal.zig +++ b/src/terminal/Terminal.zig @@ -1132,18 +1132,16 @@ pub fn eraseLine( /// scrolling region, it is adjusted down. /// /// Does not change the cursor position. -pub fn deleteChars(self: *Terminal, count_req: usize) !void { +pub fn deleteChars(self: *Terminal, count: usize) !void { const tracy = trace(@src()); defer tracy.end(); - // Count defaults to 1 and we can't delete more than we have remaining - // in the row. - const count = @min(self.cols - self.screen.cursor.x, count_req); if (count == 0) return; + // We go from our cursor right to the end and either copy the cell + // "count" away or clear it. const line = self.screen.getRow(.{ .active = self.screen.cursor.y }); - for (0..count) |i| { - const x = self.screen.cursor.x + i; + for (self.screen.cursor.x..self.cols) |x| { const copy_x = x + count; if (copy_x >= self.cols) { line.getCellPtr(x).* = self.screen.cursor.pen; @@ -2715,6 +2713,22 @@ test "Terminal: deleteChars more than line width" { } } +test "Terminal: deleteChars should shift left" { + const alloc = testing.allocator; + var t = try init(alloc, 5, 5); + defer t.deinit(alloc); + + for ("ABCDE") |c| try t.print(c); + t.setCursorPos(1, 2); + + try t.deleteChars(1); + { + var str = try t.plainString(testing.allocator); + defer testing.allocator.free(str); + try testing.expectEqualStrings("ACDE", str); + } +} + // https://github.com/mitchellh/ghostty/issues/272 // This is also tested in depth in screen resize tests but I want to keep // this test around to ensure we don't regress at multiple layers.