Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-14 15:56:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

horizontal tab off by one, add unit tests

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-04-27 21:06:28 -07:00
parent 53702343c2
commit f44649476d
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/terminal/Terminal.zig
View File

@ -114,7 +114,7 @@ pub fn append(self: *Terminal, alloc: Allocator, str: []const u8) !void {
/// ///
/// This may allocate if necessary to store the character in the grid. /// This may allocate if necessary to store the character in the grid.
pub fn appendChar(self: *Terminal, alloc: Allocator, c: u8) !void { pub fn appendChar(self: *Terminal, alloc: Allocator, c: u8) !void {
//log.debug("char: {}", .{c}); log.debug("char: {}", .{c});
const actions = self.parser.next(c); const actions = self.parser.next(c);
for (actions) |action_opt| { for (actions) |action_opt| {
switch (action_opt orelse continue) { switch (action_opt orelse continue) {
@ -163,8 +163,10 @@ pub fn horizontal_tab(self: *Terminal, alloc: Allocator) !void {
// Clear // Clear
try self.print(alloc, ' '); try self.print(alloc, ' ');
// If this is the tabstop, then we're done. // If the last cursor position was a tabstop we return. We do
if (self.tabstops.get(self.cursor.x)) return; // "last cursor position" because we want a space to be written
// at the tabstop unless we're at the end (the while condition).
if (self.tabstops.get(self.cursor.x - 1)) return;
} }
} }
@ -246,3 +248,16 @@ test "Terminal: C0 control BS" {
try testing.expectEqualStrings("helly", str); try testing.expectEqualStrings("helly", str);
} }
} }
test "Terminal: horizontal tabs" {
var t = try init(testing.allocator, 80, 5);
defer t.deinit(testing.allocator);
// HT
try t.append(testing.allocator, "1\t");
try testing.expectEqual(@as(usize, 8), t.cursor.x);
// HT
try t.append(testing.allocator, "\t");
try testing.expectEqual(@as(usize, 16), t.cursor.x);
}