Revert "chore: move binding_is_suppressed() onto Binding (#104)"

crates/core/src/pattern/state.rs

@@ -5,6 +5,7 @@ use std::ops::Range as StdRange;
 use super::compiler::MATCH_VAR;
 use super::FileOwner;
 use crate::intervals::{earliest_deadline_sort, get_top_level_intervals_in_range, Interval};
+use crate::suppress::is_binding_suppressed;
 use anyhow::{anyhow, Result};
 use anyhow::{bail, Ok};
 use im::{vector, Vector};
@@ -245,7 +246,7 @@ impl<'a> State<'a> {
                     if let ResolvedPattern::Binding(bindings) = value {
                         for binding in bindings.iter() {
                             bindings_count += 1;
-                            if binding.is_suppressed(lang, current_name) {
+                            if is_binding_suppressed(binding, lang, current_name) {
                                 suppressed_count += 1;
                                 continue;
                             }

crates/core/src/suppress.rs

@@ -7,35 +7,37 @@ use tree_sitter::{Node, Range};
 
 use crate::binding::Binding;
 
-impl<'a> Binding<'a> {
-    pub(crate) fn is_suppressed(&self, lang: &impl Language, current_name: Option<&str>) -> bool {
-        let (src, node) = match self {
-            Self::Node(src, node) | Self::List(src, node, _) | Self::Empty(src, node, _) => {
-                (src, node)
+pub(crate) fn is_binding_suppressed(
+    binding: &Binding,
+    lang: &impl Language,
+    current_name: Option<&str>,
+) -> bool {
+    let (src, node) = match binding {
+        Binding::Node(src, node) | Binding::List(src, node, _) | Binding::Empty(src, node, _) => {
+            (src, node)
+        }
+        Binding::String(_, _) | Binding::FileName(_) | Binding::ConstantRef(_) => return false,
+    };
+    let target_range = node.range();
+    for n in
+        node.children(&mut node.walk())
+            .chain(ParentTraverse::new(TreeSitterParentCursor::new(
+                node.clone(),
+            )))
+    {
+        let mut cursor = n.walk();
+        let children = n.children(&mut cursor);
+        for c in children {
+            if !(lang.is_comment(c.kind_id()) || lang.is_comment_wrapper(&c)) {
+                continue;
             }
-            Self::String(_, _) | Self::FileName(_) | Self::ConstantRef(_) => return false,
-        };
-        let target_range = node.range();
-        for n in
-            node.children(&mut node.walk())
-                .chain(ParentTraverse::new(TreeSitterParentCursor::new(
-                    node.clone(),
-                )))
-        {
-            let mut cursor = n.walk();
-            let children = n.children(&mut cursor);
-            for c in children {
-                if !(lang.is_comment(c.kind_id()) || lang.is_comment_wrapper(&c)) {
-                    continue;
-                }
-                if is_suppress_comment(&c, src, &target_range, current_name, lang) {
-                    return true;
-                }
+            if is_suppress_comment(&c, src, &target_range, current_name, lang) {
+                return true;
             }
         }
-
-        false
     }
+
+    false
 }
 
 fn is_suppress_comment(

crates/core/src/text_unparser.rs

@@ -2,6 +2,7 @@ use crate::binding::{linearize_binding, Binding};
 use crate::pattern::resolved_pattern::CodeRange;
 use crate::pattern::state::FileRegistry;
 use crate::pattern::Effect;
+use crate::suppress::is_binding_suppressed;
 use anyhow::Result;
 use im::Vector;
 use marzano_language::target_language::TargetLanguage;
@@ -29,7 +30,7 @@ pub(crate) fn apply_effects<'a>(
 ) -> Result<(String, Option<Vec<Range<usize>>>)> {
     let effects: Vec<_> = effects
         .into_iter()
-        .filter(|effect| !effect.binding.is_suppressed(language, current_name))
+        .filter(|effect| !is_binding_suppressed(&effect.binding, language, current_name))
         .collect();
     if effects.is_empty() {
         return Ok((code.to_string(), None));