summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/File.zig9
1 files changed, 6 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 {