suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix phantom lines in some CRLF files. 

Fixes #415.  The issue was that cursor highlighting wasn't extending
to encompass the entire CRLF grapheme, and therefore ended up splitting
it.  This presumably was messing up other grapheme rendering as
well, and this fixes that as well.
pull/421/head
Nathan Vegdahl 2021-07-05 00:11:07 -07:00 committed by Ivan Tham
parent fc34efea12
commit 4952d6f801
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
helix-term/src/ui/editor.rs
View File

@ -8,7 +8,7 @@ use crate::{
use helix_core::{ use helix_core::{
coords_at_pos, coords_at_pos,
graphemes::ensure_grapheme_boundary, graphemes::{ensure_grapheme_boundary, next_grapheme_boundary},
syntax::{self, HighlightEvent}, syntax::{self, HighlightEvent},
LineEnding, Position, Range, LineEnding, Position, Range,
}; };
@ -187,19 +187,24 @@ impl EditorView {
(cursor_scope, selection_scope) (cursor_scope, selection_scope)
}; };
let cursor_end = next_grapheme_boundary(text, range.head); // Used in every case below.
if range.head == range.anchor { if range.head == range.anchor {
spans.push((cursor_scope, range.head..range.head + 1)); spans.push((cursor_scope, range.head..cursor_end));
continue; continue;
} }
let reverse = range.head < range.anchor; let reverse = range.head < range.anchor;
if reverse { if reverse {
spans.push((cursor_scope, range.head..range.head + 1)); spans.push((cursor_scope, range.head..cursor_end));
spans.push((selection_scope, range.head + 1..range.anchor + 1)); spans.push((
selection_scope,
cursor_end..next_grapheme_boundary(text, range.anchor),
));
} else { } else {
spans.push((selection_scope, range.anchor..range.head)); spans.push((selection_scope, range.anchor..range.head));
spans.push((cursor_scope, range.head..range.head + 1)); spans.push((cursor_scope, range.head..cursor_end));
} }
} }