Migrate lambda

Author: AndreasArvidsson

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

@@ -82,35 +82,6 @@ const getValueNodes = (node: Node) => getChildNodesForFieldName(node, "value");
 const functionCallPattern = "~quoting_lit.list_lit!";
 const functionCallFinder = patternFinder(functionCallPattern);
 
-/**
- * Matches a function call if the name of the function is one of the given names
- * @param names The acceptable function names
- * @returns The function call node if the name matches otherwise null
- */
-function functionNameBasedFinder(...names: string[]) {
-  return (node: Node) => {
-    const functionCallNode = functionCallFinder(node);
-    if (functionCallNode == null) {
-      return null;
-    }
-
-    const functionNode = getValueNodes(functionCallNode)[0];
-
-    return names.includes(functionNode?.text) ? functionCallNode : null;
-  };
-}
-
-function functionNameBasedMatcher(...names: string[]) {
-  return matcher(functionNameBasedFinder(...names));
-}
-
-const functionFinder = functionNameBasedFinder("defn", "defmacro");
-
-const functionNameMatcher = chainedMatcher([
-  functionFinder,
-  (functionNode) => getValueNodes(functionNode)[1],
-]);
-
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {
@@ -125,15 +96,11 @@ const nodeMatchers: Partial<
   ),
 
   functionCall: functionCallPattern,
+
   functionCallee: chainedMatcher([
     functionCallFinder,
     (functionNode) => getValueNodes(functionNode)[0],
   ]),
-
-  anonymousFunction: cascadingMatcher(
-    functionNameBasedMatcher("fn"),
-    patternMatcher("anon_fn_lit"),
-  ),
 };
 
 export default createPatternMatchers(nodeMatchers);

queries/clojure.scm

@@ -80,20 +80,6 @@
   close: "}" @collectionItem.iteration.end.startOf
 ) @collectionItem.iteration.domain
 
-;;!! (if true "hello")
-;;!  ^^^^^^^^^^^^^^^^^
-;;!      ^^^^
-(
-  (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)
 ;;!  ^^^^^^^^^^^^^^^
 ;;!        ^^^
@@ -102,8 +88,35 @@
     value: (_) @_dummy
     .
     value: (_) @name @functionName
-    (#text? @_dummy defn defmacro)
   ) @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)
+  (#not-parent-type? @anonymousFunction quoting_lit)
+)
+
+;;!! #(+ 1 1)
+;;!  ^^^^^^^^
+(anon_fn_lit) @anonymousFunction
+
+;;!! (if true "hello")
+;;!  ^^^^^^^^^^^^^^^^^
+;;!      ^^^^
+(
+  (list_lit
+    value: (_) @_dummy
+    .
+    value: (_) @condition
+  ) @ifStatement @condition.domain
+  (#text? @_dummy "if" "if-let" "when" "when-let")
+  (#not-parent-type? @ifStatement quoting_lit)
+)