Migrate function call

Author: AndreasArvidsson

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

@@ -2,13 +2,7 @@ import type { SimpleScopeTypeType } from "@cursorless/common";
 import type { Node } from "web-tree-sitter";
 import type { NodeFinder, NodeMatcherAlternative } from "../typings/Types";
 import { patternFinder } from "../util/nodeFinders";
-import {
-  cascadingMatcher,
-  chainedMatcher,
-  createPatternMatchers,
-  matcher,
-  patternMatcher,
-} from "../util/nodeMatchers";
+import { createPatternMatchers, matcher } from "../util/nodeMatchers";
 import { getChildNodesForFieldName } from "../util/treeSitterUtils";
 
 /**
@@ -80,7 +74,6 @@ const getValueNodes = (node: Node) => getChildNodesForFieldName(node, "value");
 
 // A function call is a list literal which is not quoted
 const functionCallPattern = "~quoting_lit.list_lit!";
-const functionCallFinder = patternFinder(functionCallPattern);
 
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
@@ -94,13 +87,6 @@ const nodeMatchers: Partial<
       nodeIndex !== 0 ? nodeIndex : -1,
     ),
   ),
-
-  functionCall: functionCallPattern,
-
-  functionCallee: chainedMatcher([
-    functionCallFinder,
-    (functionNode) => getValueNodes(functionNode)[0],
-  ]),
 };
 
 export default createPatternMatchers(nodeMatchers);

queries/clojure.scm

@@ -80,24 +80,36 @@
   close: "}" @collectionItem.iteration.end.startOf
 ) @collectionItem.iteration.domain
 
+;;!! (hello)
+;;!  ^^^^^^^
+(
+  (list_lit
+    .
+    value: (_) @functionCallee
+  ) @functionCall @functionCallee.domain
+  ;; A function call is a list literal which is not quoted
+  (#not-parent-type? @functionCall quoting_lit)
+)
+
 ;;!! (defn foo [] 5)
 ;;!  ^^^^^^^^^^^^^^^
 ;;!        ^^^
 (
   (list_lit
+    .
     value: (_) @_dummy
     .
     value: (_) @name @functionName
   ) @namedFunction @name.domain @functionName.domain
   (#text? @_dummy defn defmacro)
-  ;; A function call is a list literal which is not quoted
   (#not-parent-type? @namedFunction quoting_lit)
 )
 
 ;;!! (fn [] 5)
 ;;!  ^^^^^^^^^
 (
   (list_lit
+    .
     value: (_) @_dummy
   ) @anonymousFunction
   (#text? @_dummy fn)
@@ -113,6 +125,7 @@
 ;;!      ^^^^
 (
   (list_lit
+    .
     value: (_) @_dummy
     .
     value: (_) @condition