Migrate function

Author: AndreasArvidsson

packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts

@@ -15,9 +15,8 @@ import { q } from "./operatorArgumentSchemaTypes";
 class Text extends QueryPredicateOperator<Text> {
   name = "text?" as const;
   schema = z.tuple([q.node, q.string]).rest(q.string);
-  run({ node, document, range }: MutableQueryCapture, ...texts: string[]) {
-    const text = document.getText(range);
-    return texts.includes(text);
+  run({ document, range }: MutableQueryCapture, ...texts: string[]) {
+    return texts.includes(document.getText(range));
   }
 }
 

packages/cursorless-engine/src/languages/clojure.ts

@@ -130,13 +130,6 @@ const nodeMatchers: Partial<
     (functionNode) => getValueNodes(functionNode)[0],
   ]),
 
-  namedFunction: matcher(functionFinder),
-
-  functionName: functionNameMatcher,
-
-  // FIXME: Handle `let` declarations, defs, etc
-  name: functionNameMatcher,
-
   anonymousFunction: cascadingMatcher(
     functionNameBasedMatcher("fn"),
     patternMatcher("anon_fn_lit"),

queries/clojure.scm

@@ -83,9 +83,27 @@
 ;;!! (if true "hello")
 ;;!  ^^^^^^^^^^^^^^^^^
 ;;!      ^^^^
-(list_lit
-  value: (_) @_dummy
-  .
-  value: (_) @condition
-  (#text? @_dummy "if" "if-let" "when" "when-let")
-) @ifStatement @condition.domain
+(
+  (list_lit
+    value: (_) @_dummy
+    .
+    value: (_) @condition
+    (#text? @_dummy "if" "if-let" "when" "when-let")
+  ) @ifStatement @condition.domain
+  ;; A function call is a list literal which is not quoted
+  (#not-parent-type? @ifStatement quoting_lit)
+)
+
+;;!! (defn foo [] 5)
+;;!  ^^^^^^^^^^^^^^^
+;;!        ^^^
+(
+  (list_lit
+    value: (_) @_dummy
+    .
+    value: (_) @name @functionName
+    (#text? @_dummy defn defmacro)
+  ) @namedFunction @name.domain @functionName.domain
+  ;; A function call is a list literal which is not quoted
+  (#not-parent-type? @namedFunction quoting_lit)
+)