aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA-Walrus2022-10-10 08:13:25 +0000
committerBlaž Hrastnik2022-10-17 15:38:16 +0000
commit3ba665d804c8d88bc3d59a52296f349acdb6d436 (patch)
tree3a76e46fb28d90aa7e4c0a716dd14bb9355db084
parent4e691d62470a4f92ee5bf2e2609a97d0e1ec832c (diff)
Fix rendering of lines longer than 2^16
Before things would be cast to u16 earlier than needed, which would cause problems for insanely long lines (longer than 2^16 ~ 65 thousand)
-rw-r--r--helix-term/src/ui/editor.rs19
-rw-r--r--helix-view/src/editor.rs2
2 files changed, 10 insertions, 11 deletions
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 8e9d8631..c6a83546 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -428,7 +428,7 @@ impl EditorView {
let characters = &whitespace.characters;
let mut spans = Vec::new();
- let mut visual_x = 0u16;
+ let mut visual_x = 0usize;
let mut line = 0u16;
let tab_width = doc.tab_width();
let tab = if whitespace.render.tab() == WhitespaceRenderValue::All {
@@ -465,14 +465,13 @@ impl EditorView {
return;
}
- let starting_indent =
- (offset.col / tab_width) as u16 + config.indent_guides.skip_levels;
+ let starting_indent = (offset.col / tab_width) + config.indent_guides.skip_levels;
// TODO: limit to a max indent level too. It doesn't cause visual artifacts but it would avoid some
// extra loops if the code is deeply nested.
- for i in starting_indent..(indent_level / tab_width as u16) {
+ for i in starting_indent..(indent_level / tab_width) {
surface.set_string(
- viewport.x + (i * tab_width as u16) - offset.col as u16,
+ (viewport.x as usize + (i * tab_width) - offset.col) as u16,
viewport.y + line,
&indent_guide_char,
indent_guide_style,
@@ -518,14 +517,14 @@ impl EditorView {
use helix_core::graphemes::{grapheme_width, RopeGraphemes};
for grapheme in RopeGraphemes::new(text) {
- let out_of_bounds = visual_x < offset.col as u16
- || visual_x >= viewport.width + offset.col as u16;
+ let out_of_bounds = offset.col > (visual_x as usize)
+ || (visual_x as usize) >= viewport.width as usize + offset.col;
if LineEnding::from_rope_slice(&grapheme).is_some() {
if !out_of_bounds {
// we still want to render an empty cell with the style
surface.set_string(
- viewport.x + visual_x - offset.col as u16,
+ (viewport.x as usize + visual_x - offset.col) as u16,
viewport.y + line,
&newline,
style.patch(whitespace_style),
@@ -573,7 +572,7 @@ impl EditorView {
if !out_of_bounds {
// if we're offscreen just keep going until we hit a new line
surface.set_string(
- viewport.x + visual_x - offset.col as u16,
+ (viewport.x as usize + visual_x - offset.col) as u16,
viewport.y + line,
display_grapheme,
if is_whitespace {
@@ -606,7 +605,7 @@ impl EditorView {
last_line_indent_level = visual_x;
}
- visual_x = visual_x.saturating_add(width as u16);
+ visual_x = visual_x.saturating_add(width);
}
}
}
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 60b3880c..dd1e30f9 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -558,7 +558,7 @@ impl Default for WhitespaceCharacters {
pub struct IndentGuidesConfig {
pub render: bool,
pub character: char,
- pub skip_levels: u16,
+ pub skip_levels: usize,
}
impl Default for IndentGuidesConfig {