Bug fix in contains clause in concrete syntax (#775)

Concrete syntax contains was passing the wrong node for the checker, and
was matching with nodes it shouldn't. It was a very subtle bug. This PR
should fix it.

Author: danieltrt

crates/concrete-syntax/src/models/concrete_syntax/constraint_checker.rs

@@ -17,6 +17,7 @@ use super::interpreter::get_all_matches_for_concrete_syntax;
 use super::tree_sitter_adapter::{Node, SyntaxNode};
 use crate::models::concrete_syntax::parser::CsConstraint;
 use crate::models::matches::CapturedNode;
+use crate::tree_sitter_adapter::SyntaxCursor;
 
 /// Simple context for contains constraint checking
 pub struct ConstraintContext<'a> {
@@ -64,13 +65,12 @@ fn check_contains_recursive(
 ) -> bool {
   // Run the resolved pattern against the entire AST
   let matches = get_all_matches_for_concrete_syntax(
-    context.ast_root,
+    &context.ast_root.walk().node(),
     context.source_code,
     resolved_pattern,
     true, // recursive
     None, // replace_node
   );
-
   // If we found any matches, the contains constraint is satisfied
   !matches.is_empty()
 }

crates/concrete-syntax/src/models/concrete_syntax/interpreter.rs

@@ -394,7 +394,7 @@ fn try_match_node_range(
     let constraint_context = ConstraintContext {
       captured_node: &captured,
       source_code: ctx.source_code,
-      ast_root: ctx.top_node,
+      ast_root: &ctx.cursor.node(),
     };
     if satisfies_constraints(&captured, constraints, Some(&constraint_context)) {
       let mut sub_ctx = MatchingContext {

crates/concrete-syntax/src/models/concrete_syntax/unit_tests/interpreter_test.rs

@@ -484,3 +484,61 @@ fn test_not_contains_constraint() {
     GO,
   );
 }
+
+#[test]
+fn test_contains_constraint_bug_minimal() {
+  // Minimal anonymized test for contains constraint bug
+  run_test(
+    r#"func TestSomething(t *testing.T) {
+    for _, tc := range[] struct {
+      fieldA   string
+      fieldB   int
+      flag1    bool
+      flag2    bool
+      flag3    bool
+    } {
+      {
+        fieldA: "a",
+        flag2: false,
+        flag3: false,
+      },
+      {
+        fieldA: "b",
+        flag2: true,
+        flag3: false,
+      },
+      {
+        fieldA: "c",
+        flag2: true,
+        flag3: true,
+      },
+    }
+}"#,
+    r#"{
+    :[before*]
+    :[to_delete]
+    :[after*]
+    }
+    |>
+    :[to_delete].node_type in ["keyed_element"],
+    :[to_delete] contains /flag3: true/"#,
+    2,
+    vec![
+      vec![
+        ("to_delete", "flag3: true"),
+        (
+          "*",
+          "{\n        fieldA: \"c\",\n        flag2: true,\n        flag3: true,\n      }",
+        ),
+      ],
+      vec![
+        ("to_delete", "flag3: true"),
+        (
+          "*",
+          "{\n        fieldA: \"c\",\n        flag2: true,\n        flag3: true,\n      }",
+        ),
+      ],
+    ],
+    GO,
+  );
+}