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

terminal: screen test dumpString function should add graphemes

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-08-28 08:07:40 -07:00
parent 83959cd058
commit c243c9d72e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/terminal/Screen.zig
View File

@ -2791,6 +2791,11 @@ pub fn dumpString(self: *Screen, writer: anytype, opts: Dump) !void {
const codepoint: u21 = @intCast(cell.char); const codepoint: u21 = @intCast(cell.char);
try writer.print("{u}", .{codepoint}); try writer.print("{u}", .{codepoint});
var it = row.codepointIterator(cells.i - 1);
while (it.next()) |cp| {
try writer.print("{u}", .{cp});
}
} }
} }
} }
@ -4799,9 +4804,10 @@ test "Screen: resize (no reflow) grapheme copy" {
// Resize // Resize
try s.resizeWithoutReflow(10, 5); try s.resizeWithoutReflow(10, 5);
{ {
const expected = "1️A️B️C️D️\n2️E️F️G️H️\n3️I️J️K️L️";
var contents = try s.testString(alloc, .viewport); var contents = try s.testString(alloc, .viewport);
defer alloc.free(contents); defer alloc.free(contents);
try testing.expectEqualStrings(str, contents); try testing.expectEqualStrings(expected, contents);
} }
// Everything should be dirty // Everything should be dirty
@ -5133,14 +5139,16 @@ test "Screen: resize more cols grapheme map" {
try testing.expectEqual(cursor, s.cursor); try testing.expectEqual(cursor, s.cursor);
{ {
const expected = "1️A️B️C️D️\n2️E️F️G️H️\n3️I️J️K️L️";
var contents = try s.testString(alloc, .viewport); var contents = try s.testString(alloc, .viewport);
defer alloc.free(contents); defer alloc.free(contents);
try testing.expectEqualStrings(str, contents); try testing.expectEqualStrings(expected, contents);
} }
{ {
const expected = "1️A️B️C️D️\n2️E️F️G️H️\n3️I️J️K️L️";
var contents = try s.testString(alloc, .screen); var contents = try s.testString(alloc, .screen);
defer alloc.free(contents); defer alloc.free(contents);
try testing.expectEqualStrings(str, contents); try testing.expectEqualStrings(expected, contents);
} }
} }