mirror of https://github.com/helix-editor/helix
d5f17d3f69
The purpose of this change is to remove the mutable self borrow on
`HighlightIterLayer::sort_key` so that we can sort layers with the
correct ordering using the `Vec::sort` function family.
`HighlightIterLayer::sort_key` needs `&mut self` since it calls
`Peekable::peek` which needs `&mut self`. `Vec::sort` functions
only give immutable borrows of the elements to ensure the
correctness of the sort.
We could instead approach this by creating an eager Peekable and using
that instead of `std::iter::Peekable` to wrap `QueryCaptures`:
```rust
struct EagerPeekable<I: Iterator> {
iter: I,
peeked: Option<I::Item>,
}
impl<I: Iterator> EagerPeekable<I> {
fn new(mut iter: I) -> Self {
let peeked = iter.next();
Self { iter, peeked }
}
fn peek(&self) -> Option<&I::Item> {
self.peeked.as_ref()
}
}
impl<I: Iterator> Iterator for EagerPeekable<I> {
type Item = I::Item;
fn next(&mut self) -> Option<Self::Item> {
std::mem::replace(&mut self.peeked, self.iter.next())
}
}
```
This would be a cleaner approach (notice how `EagerPeekable::peek`
takes `&self` rather than `&mut self`), however this doesn't work in
practice because the Items emitted by the `tree_sitter::QueryCaptures`
Iterator must be consumed before the next Item is returned.
`Iterator::next` on `tree_sitter::QueryCaptures` modifies the
`QueryMatch` returned by the last call of `next`. This behavior is
not currently reflected in the lifetimes/structure of `QueryCaptures`.
This fixes an issue with layers being out of order when using combined
injections since the old code only checked the first range in the
layer. Layers being out of order could cause missing highlights for
combined-injections content.
|
||
|---|---|---|
| .. | ||
| doc_formatter | ||
| increment | ||
| auto_pairs.rs | ||
| chars.rs | ||
| comment.rs | ||
| config.rs | ||
| diagnostic.rs | ||
| diff.rs | ||
| doc_formatter.rs | ||
| graphemes.rs | ||
| history.rs | ||
| indent.rs | ||
| lib.rs | ||
| line_ending.rs | ||
| macros.rs | ||
| match_brackets.rs | ||
| movement.rs | ||
| object.rs | ||
| path.rs | ||
| position.rs | ||
| register.rs | ||
| search.rs | ||
| selection.rs | ||
| shellwords.rs | ||
| surround.rs | ||
| syntax.rs | ||
| test.rs | ||
| text_annotations.rs | ||
| textobject.rs | ||
| transaction.rs | ||
| wrap.rs | ||