kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix rendering of lines longer than 2^16

Browse source 
Before things would be cast to u16 earlier than needed, which would
cause problems for insanely long lines (longer than 2^16 ~ 65 thousand)
This commit is contained in:
A-Walrus 2022-10-10 11:13:25 +03:00 • committed by Blaž Hrastnik
parent 4e691d6247
commit 3ba665d804
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
helix-term/src/ui/editor.rs
View file

@ -428,7 +428,7 @@ impl EditorView {
let characters = &whitespace.characters; let characters = &whitespace.characters;
let mut spans = Vec::new(); let mut spans = Vec::new();
let mut visual_x = 0u16; let mut visual_x = 0usize;
let mut line = 0u16; let mut line = 0u16;
let tab_width = doc.tab_width(); let tab_width = doc.tab_width();
let tab = if whitespace.render.tab() == WhitespaceRenderValue::All { let tab = if whitespace.render.tab() == WhitespaceRenderValue::All {
@ -465,14 +465,13 @@ impl EditorView {
return; return;
} }
let starting_indent = let starting_indent = (offset.col / tab_width) + config.indent_guides.skip_levels;
(offset.col / tab_width) as u16 + config.indent_guides.skip_levels;
// TODO: limit to a max indent level too. It doesn't cause visual artifacts but it would avoid some // 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. // 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( 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, viewport.y + line,
&indent_guide_char, &indent_guide_char,
indent_guide_style, indent_guide_style,
@ -518,14 +517,14 @@ impl EditorView {
use helix_core::graphemes::{grapheme_width, RopeGraphemes}; use helix_core::graphemes::{grapheme_width, RopeGraphemes};
for grapheme in RopeGraphemes::new(text) { for grapheme in RopeGraphemes::new(text) {
let out_of_bounds = visual_x < offset.col as u16 let out_of_bounds = offset.col > (visual_x as usize)
|| visual_x >= viewport.width + offset.col as u16; || (visual_x as usize) >= viewport.width as usize + offset.col;
if LineEnding::from_rope_slice(&grapheme).is_some() { if LineEnding::from_rope_slice(&grapheme).is_some() {
if !out_of_bounds { if !out_of_bounds {
// we still want to render an empty cell with the style // we still want to render an empty cell with the style
surface.set_string( surface.set_string(
viewport.x + visual_x - offset.col as u16, (viewport.x as usize + visual_x - offset.col) as u16,
viewport.y + line, viewport.y + line,
&newline, &newline,
style.patch(whitespace_style), style.patch(whitespace_style),
@ -573,7 +572,7 @@ impl EditorView {
if !out_of_bounds { if !out_of_bounds {
// if we're offscreen just keep going until we hit a new line // if we're offscreen just keep going until we hit a new line
surface.set_string( surface.set_string(
viewport.x + visual_x - offset.col as u16, (viewport.x as usize + visual_x - offset.col) as u16,
viewport.y + line, viewport.y + line,
display_grapheme, display_grapheme,
if is_whitespace { if is_whitespace {
@ -606,7 +605,7 @@ impl EditorView {
last_line_indent_level = visual_x; last_line_indent_level = visual_x;
} }
visual_x = visual_x.saturating_add(width as u16); visual_x = visual_x.saturating_add(width);
} }
} }
} }

2
helix-view/src/editor.rs
View file

@ -558,7 +558,7 @@ impl Default for WhitespaceCharacters {
pub struct IndentGuidesConfig { pub struct IndentGuidesConfig {
pub render: bool, pub render: bool,
pub character: char, pub character: char,
pub skip_levels: u16, pub skip_levels: usize,
} }
impl Default for IndentGuidesConfig { impl Default for IndentGuidesConfig {