prevent future matches for '#is-not? local' patterns

This commit is contained in:
Michael Davis 2022-01-16 20:05:58 -06:00
parent e96ee19901
commit 83ef0aea12
No known key found for this signature in database
GPG key ID: 25D3AFE4BA2A0C49

View file

@ -111,6 +111,7 @@ struct HighlightIterLayer<'a> {
scope_stack: Vec<LocalScope<'a>>,
ranges: Vec<Range>,
depth: usize,
ignore_match_ids: Vec<u32>,
}
impl Highlighter {
@ -413,6 +414,7 @@ impl<'a> HighlightIterLayer<'a> {
captures,
config,
ranges,
ignore_match_ids: Vec::new(),
});
}
@ -683,6 +685,10 @@ 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()) {
continue 'main;
}
// If this capture represents an injection, then process the injection.
if match_.pattern_index < layer.config.locals_pattern_index {
let (language_name, content_node, include_children) =
@ -835,6 +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());
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 {