traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use just an i32 to ignore match IDs

Browse source
This commit is contained in:
Michael Davis 2022-01-17 22:20:05 -06:00
parent 83ef0aea12
commit 51354ef776
No known key found for this signature in database
GPG key ID: 25D3AFE4BA2A0C49
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
highlight/src/lib.rs
View file

@ -111,7 +111,7 @@ struct HighlightIterLayer<'a> {
scope_stack: Vec<LocalScope<'a>>,
ranges: Vec<Range>,
depth: usize,
ignore_match_ids: Vec<u32>,
ignore_match_id: i32,
}
impl Highlighter {
@ -414,7 +414,7 @@ impl<'a> HighlightIterLayer<'a> {
captures,
config,
ranges,
ignore_match_ids: Vec::new(),
ignore_match_id: -1,
});
}
@ -685,7 +685,7 @@ where
let (mut match_, capture_index) = layer.captures.next().unwrap();
let mut capture = match_.captures[capture_index];
if layer.ignore_match_ids.contains(&match_.id()) {
if layer.ignore_match_id >= match_.id() as i32 {
continue 'main;
}
@ -841,7 +841,7 @@ where
// highlighting patterns that are disabled for local variables.
if definition_highlight.is_some() || reference_highlight.is_some() {
while layer.config.non_local_variable_patterns[match_.pattern_index] {
layer.ignore_match_ids.push(match_.id());
layer.ignore_match_id = match_.id() as i32;
if let Some((next_match, next_capture_index)) = layer.captures.peek() {
let next_capture = next_match.captures[*next_capture_index];
if next_capture.node == capture.node {