summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/File.zig9
-rw-r--r--test/panes.zig3
2 files changed, 9 insertions, 3 deletions
diff --git a/src/File.zig b/src/File.zig
index 6df49c98..e4bca000 100644
--- a/src/File.zig
+++ b/src/File.zig
@@ -509,10 +509,13 @@ pub fn rawDisplayCol(line_text: []const u8, raw_col: usize) usize {
return displayWidth(line_text[0..bounded]) +| (raw_col -| line_text.len);
}
+/// Walked only as far as the column: a row's last byte, a million bytes
+/// into a line, is found without measuring the rest of it. Only a line
+/// that ends before the column is measured whole (it is short).
pub fn rawAtDisplay(line_text: []const u8, display_col: usize) usize {
- const width = displayWidth(line_text);
- if (display_col > width) return line_text.len +| (display_col - width);
- return byteAtDisplay(line_text, display_col);
+ const at = byteAtDisplay(line_text, display_col);
+ if (at < line_text.len) return at;
+ return line_text.len +| (display_col -| displayWidth(line_text));
}
pub fn byteAtDisplayFrom(line_text: []const u8, from_raw: usize, display_col: usize) usize {
diff --git a/test/panes.zig b/test/panes.zig
index e2cd85dc..0379a03d 100644
--- a/test/panes.zig
+++ b/test/panes.zig
@@ -2661,6 +2661,9 @@ const FileTests = struct {
try std.testing.expectEqual(text.len, byteAtDisplay(text, 5));
try std.testing.expectEqual(@as(usize, 3), rawDisplayCol(text, 5));
try std.testing.expectEqual(@as(usize, 5), rawAtDisplay(text, 3));
+ // At the line's end and past it (virtual columns, one byte each).
+ try std.testing.expectEqual(text.len, rawAtDisplay(text, 5));
+ try std.testing.expectEqual(text.len + 2, rawAtDisplay(text, 7));
try std.testing.expectEqual(@as(usize, 2), graphemeDisplayWidth("👩\u{200d}🚀"));
}