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

syntax: highlight_iter always returns Ok()

Browse source
This commit is contained in:
Blaž Hrastnik 2021-03-16 13:49:22 +09:00
parent 71f899cb5b
commit 081e0ae8ae
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
helix-core/src/syntax.rs
View file

@ -269,7 +269,7 @@ impl Syntax {
range: Option<std::ops::Range<usize>>, range: Option<std::ops::Range<usize>>,
cancellation_flag: Option<&'a AtomicUsize>, cancellation_flag: Option<&'a AtomicUsize>,
mut injection_callback: impl FnMut(&str) -> Option<&'a HighlightConfiguration> + 'a, mut injection_callback: impl FnMut(&str) -> Option<&'a HighlightConfiguration> + 'a,
) -> Result<impl Iterator<Item = Result<HighlightEvent, Error>> + 'a, Error> { ) -> impl Iterator<Item = Result<HighlightEvent, Error>> + 'a {
// The `captures` iterator borrows the `Tree` and the `QueryCursor`, which // The `captures` iterator borrows the `Tree` and the `QueryCursor`, which
// prevents them from being moved. But both of these values are really just // prevents them from being moved. But both of these values are really just
// pointers, so it's actually ok to move them. // pointers, so it's actually ok to move them.
@ -325,7 +325,7 @@ impl Syntax {
last_highlight_range: None, last_highlight_range: None,
}; };
result.sort_layers(); result.sort_layers();
Ok(result) result
} }
// on_tokenize // on_tokenize
// on_change_highlighting // on_change_highlighting

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

@ -94,7 +94,6 @@ impl EditorView {
Some(syntax) => { Some(syntax) => {
syntax syntax
.highlight_iter(text.slice(..), Some(range), None, |_| None) .highlight_iter(text.slice(..), Some(range), None, |_| None)
.unwrap()
.collect() // TODO: we collect here to avoid holding the lock, fix later .collect() // TODO: we collect here to avoid holding the lock, fix later
} }
None => vec![Ok(HighlightEvent::Source { None => vec![Ok(HighlightEvent::Source {