mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-03 19:07:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Reverse highlight precedence ordering (#9458)

Browse source 
Co-authored-by: postsolar <120750161+postsolar@users.noreply.github.com>
Co-authored-by: Iorvethe <58810330+Iorvethe@users.noreply.github.com>
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: gabydd <gabydinnerdavid@gmail.com>
This commit is contained in:
Michael Davis 2025-02-02 19:17:10 -05:00 • committed by GitHub
parent 382401020c
commit 5952d564d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
99 changed files with 2304 additions and 1946 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2502,15 +2502,17 @@ impl Iterator for HighlightIter<'_> {
}
}
// Once a highlighting pattern is found for the current node, skip over
// any later highlighting patterns that also match this node. Captures
// Use the last capture found for the current node, skipping over any
// highlight patterns that also match this node. Captures
// for a given node are ordered by pattern index, so these subsequent
// captures are guaranteed to be for highlighting, not injections or
// local variables.
while let Some((next_match, next_capture_index)) = captures.peek() {
let next_capture = next_match.captures[*next_capture_index];
if next_capture.node == capture.node {
captures.next();
match_.remove();
capture = next_capture;
match_ = captures.next().unwrap().0;
} else {
break;
}