Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-term/src/ui/editor.rs')
-rw-r--r--helix-term/src/ui/editor.rs22
1 files changed, 4 insertions, 18 deletions
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 2aac3d33..7b130a38 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -12,9 +12,7 @@ use crate::{
use helix_core::{
diagnostic::NumberOrString,
- graphemes::{
- ensure_grapheme_boundary_next_byte, next_grapheme_boundary, prev_grapheme_boundary,
- },
+ graphemes::{next_grapheme_boundary, prev_grapheme_boundary},
movement::Direction,
syntax::{self, HighlightEvent},
text_annotations::TextAnnotations,
@@ -315,26 +313,14 @@ impl EditorView {
let iter = syntax
// TODO: range doesn't actually restrict source, just highlight range
.highlight_iter(text.slice(..), Some(range), None)
- .map(|event| event.unwrap())
- .map(move |event| match event {
- // TODO: use byte slices directly
- // convert byte offsets to char offset
- HighlightEvent::Source { start, end } => {
- let start =
- text.byte_to_char(ensure_grapheme_boundary_next_byte(text, start));
- let end =
- text.byte_to_char(ensure_grapheme_boundary_next_byte(text, end));
- HighlightEvent::Source { start, end }
- }
- event => event,
- });
+ .map(|event| event.unwrap());
Box::new(iter)
}
None => Box::new(
[HighlightEvent::Source {
- start: text.byte_to_char(range.start),
- end: text.byte_to_char(range.end),
+ start: range.start,
+ end: range.end,
}]
.into_iter(),
),