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

terminal: tabstops were off by one

Browse Source 
Fixes #359

See #359 for a test script. The unit tests were also wrong. I used the
test script in #359 to verify the exact column that tabstops should be
set at.
This commit is contained in:
Mitchell Hashimoto
2023-08-29 20:18:54 -07:00
parent 5583859332
commit 7e846bd367
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/terminal/Tabstops.zig
View File

@ -149,7 +149,7 @@ pub fn reset(self: *Tabstops, interval: usize) void {
@memset(self.dynamic_stops, 0); @memset(self.dynamic_stops, 0);
if (interval > 0) { if (interval > 0) {
var i: usize = interval - 1; var i: usize = interval;
while (i < self.cols - 1) : (i += interval) { while (i < self.cols - 1) : (i += interval) {
self.set(i); self.set(i);
} }
@ -203,9 +203,9 @@ test "Tabstops: interval" {
var t: Tabstops = try init(testing.allocator, 80, 4); var t: Tabstops = try init(testing.allocator, 80, 4);
defer t.deinit(testing.allocator); defer t.deinit(testing.allocator);
try testing.expect(!t.get(0)); try testing.expect(!t.get(0));
try testing.expect(t.get(3)); try testing.expect(t.get(4));
try testing.expect(!t.get(4)); try testing.expect(!t.get(5));
try testing.expect(t.get(7)); try testing.expect(t.get(8));
} }
test "Tabstops: count on 80" { test "Tabstops: count on 80" {

8
src/terminal/Terminal.zig
View File

@ -1901,11 +1901,11 @@ test "Terminal: horizontal tabs" {
// HT // HT
try t.print('1'); try t.print('1');
try t.horizontalTab(); try t.horizontalTab();
try testing.expectEqual(@as(usize, 7), t.screen.cursor.x); try testing.expectEqual(@as(usize, 8), t.screen.cursor.x);
// HT // HT
try t.horizontalTab(); try t.horizontalTab();
try testing.expectEqual(@as(usize, 15), t.screen.cursor.x); try testing.expectEqual(@as(usize, 16), t.screen.cursor.x);
// HT at the end // HT at the end
try t.horizontalTab(); try t.horizontalTab();
@ -1924,11 +1924,11 @@ test "Terminal: horizontal tabs back" {
// HT // HT
try t.horizontalTabBack(); try t.horizontalTabBack();
try testing.expectEqual(@as(usize, 15), t.screen.cursor.x); try testing.expectEqual(@as(usize, 16), t.screen.cursor.x);
// HT // HT
try t.horizontalTabBack(); try t.horizontalTabBack();
try testing.expectEqual(@as(usize, 7), t.screen.cursor.x); try testing.expectEqual(@as(usize, 8), t.screen.cursor.x);
// HT // HT
try t.horizontalTabBack(); try t.horizontalTabBack();