ast-search-python 1.0.4 → 1.0.5

package/build/query.js

@@ -10,7 +10,11 @@ function assertValidPattern(pattern) {
 export function runTreeSitterQuery(ast, pattern, source, filePath, language) {
     assertValidPattern(pattern);
     const tree = ast;
-    const q = language.query(pattern);
+    // captures() only returns nodes that have a capture name (@something).
+    // If the user wrote a bare S-expression like (function_definition), add @_
+    // so results are returned.
+    const queryPattern = pattern.includes("@") ? pattern : `${pattern} @_`;
+    const q = language.query(queryPattern);
     const captures = q.captures(tree.rootNode);
     // web-tree-sitter may return different JS objects for the same node when
     // multiple capture names match it, so deduplicate by position instead of identity.

package/build/shorthands.js

@@ -41,11 +41,14 @@ export const PYTHON_SHORTHANDS = {
     decorated: "(decorated_definition) @_",
 };
 export function expandShorthands(selector) {
-    // Replace bare shorthand words (not inside quotes and not preceded by @)
-    // with their S-expression. The negative lookbehind prevents expanding
-    // capture names like @fn into @(function_definition) @_.
+    // Replace bare shorthand words (not inside quotes and not preceded by @ or ()
+    // with their S-expression. The negative lookbehind prevents expanding:
+    //   - capture names like @fn into @(function_definition) @_
+    //   - node type names inside S-expressions like (call ...) into ((call) @_ ...)
+    //     which matters for shorthands whose name matches the tree-sitter node type
+    //     exactly (call, await, yield, lambda, decorator).
     const keys = Object.keys(PYTHON_SHORTHANDS);
-    const pattern = new RegExp(`(?<!@)\\b(${keys.join("|")})\\b`, "g");
+    const pattern = new RegExp(`(?<![@(])\\b(${keys.join("|")})\\b`, "g");
     const parts = [];
     let i = 0;
     while (i < selector.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ast-search-python",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Python language plugin for ast-search",
   "type": "module",
   "main": "./build/index.js",