Fix nested bindings in queries

NomicFoundation · Apr 8, 2024 · 790037c · 790037c
1 parent aa1c073
commit 790037c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/crates/codegen/parser/runtime/src/query/engine.rs b/crates/codegen/parser/runtime/src/query/engine.rs
@@ -181,6 +181,7 @@ impl Combinator for BindingCombinator {
             .entry(self.matcher.name.clone())
             .or_default()
             .push(self.cursor.clone());
+        self.child.accumulate_bindings(bindings);
     }
 }
 

diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/query/engine.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/query/engine.rs
diff --git a/crates/testlang/outputs/cargo/slang_testlang/src/generated/query/engine.rs b/crates/testlang/outputs/cargo/slang_testlang/src/generated/query/engine.rs
diff --git a/crates/testlang/outputs/cargo/tests/src/query/engine_tests.rs b/crates/testlang/outputs/cargo/tests/src/query/engine_tests.rs
@@ -250,3 +250,14 @@ fn test_optional() {
         },
     );
 }
+
+#[test]
+fn test_nested() {
+    run_query_test(
+        &common_test_tree(),
+        "@root [TreeNode ... @z [DelimitedIdentifier] [_] ]",
+        query_results! {
+            {root: ["ABCDE"], z: ["C"]}
+        },
+    );
+}