refactor

Author: nik-rev

highlighter/src/injections_query.rs

@@ -89,8 +89,9 @@ pub struct InjectionsQuery {
     injection_language_capture: Option<Capture>,
     injection_filename_capture: Option<Capture>,
     injection_shebang_capture: Option<Capture>,
-    injection_parent_layer_langs_predicate: Option<Vec<String>>,
-    injection_parent_layer_langs_predicate_negated: bool,
+    /// 1. The list of matches to compare the parent layer's language
+    /// 1. Whether it is negated: `#any-of` or `#not-any-of?`
+    injection_parent_layer_langs_predicate: Option<(Vec<String>, bool)>,
     // Note that the injections query is concatenated with the locals query.
     pub(crate) local_query: Query,
     // TODO: Use a Vec<bool> instead?
@@ -111,7 +112,6 @@ impl InjectionsQuery {
         query_source.push_str(local_query_text);
 
         let mut injection_parent_layer_langs_predicate = None;
-        let mut injection_parent_layer_langs_predicate_negated = false;
 
         let mut injection_properties: HashMap<Pattern, InjectionProperties> = HashMap::new();
         let mut not_scope_inherits = HashSet::new();
@@ -134,9 +134,8 @@ impl InjectionsQuery {
                     value: INJECTION_PARENT_LAYER,
                     values,
                 } => {
-                    injection_parent_layer_langs_predicate_negated = negated;
                     injection_parent_layer_langs_predicate =
-                        Some(values.into_iter().map(ToOwned::to_owned).collect());
+                        Some((values.into_iter().map(ToOwned::to_owned).collect(), negated));
                 }
                 UserPredicate::SetProperty {
                     key: "injection.include-children",
@@ -184,7 +183,6 @@ impl InjectionsQuery {
 
         Ok(InjectionsQuery {
             injection_parent_layer_langs_predicate,
-            injection_parent_layer_langs_predicate_negated,
             injection_properties,
             injection_content_capture: injection_query.get_capture("injection.content"),
             injection_language_capture: injection_query.get_capture("injection.language"),
@@ -271,15 +269,15 @@ impl InjectionsQuery {
                         let matches_predicate = || {
                             self.injection_parent_layer_langs_predicate
                                 .as_ref()
-                                .is_none_or(|predicate| {
+                                .is_none_or(|(predicate, is_negated)| {
                                     predicate.iter().any(|capture| {
                                         let Some(marker) = loader.language_for_marker(
                                             InjectionLanguageMarker::Name(capture),
                                         ) else {
                                             return false;
                                         };
 
-                                        if self.injection_parent_layer_langs_predicate_negated {
+                                        if *is_negated {
                                             marker != injection_parent_language
                                         } else {
                                             marker == injection_parent_language