Migrate lambda

Author: AndreasArvidsson

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

@@ -1,5 +1,4 @@
 import type { SimpleScopeTypeType } from "@cursorless/common";
-import type { Node } from "web-tree-sitter";
 import type { NodeMatcherAlternative } from "../typings/Types";
 import { patternFinder } from "../util/nodeFinders";
 import {
@@ -8,7 +7,6 @@ import {
   cascadingMatcher,
   createPatternMatchers,
   leadingMatcher,
-  matcher,
   patternMatcher,
   trailingMatcher,
 } from "../util/nodeMatchers";
@@ -130,25 +128,6 @@ const assignmentOperators = [
 ];
 const mapKeyValueSeparators = [":", "=>"];
 
-function blockFinder(node: Node) {
-  if (node.type !== "call") {
-    return null;
-  }
-
-  const receiver = node.childForFieldName("receiver");
-  const method = node.childForFieldName("method");
-  const block = node.childForFieldName("block");
-
-  if (
-    (receiver?.text === "Proc" && method?.text === "new") ||
-    (receiver == null && method?.text === "lambda")
-  ) {
-    return node;
-  }
-
-  return block;
-}
-
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {
@@ -162,10 +141,6 @@ const nodeMatchers: Partial<
       1,
     ),
   ),
-  anonymousFunction: cascadingMatcher(
-    patternMatcher("lambda", "do_block"),
-    matcher(blockFinder),
-  ),
   argumentOrParameter: argumentMatcher(
     "lambda_parameters",
     "method_parameters",

queries/ruby.scm

@@ -101,3 +101,36 @@ operator: [
 (_
   condition: (_) @condition
 ) @_.domain
+
+;;!! hi = -> { puts "Hi!" }
+;;!       ^^^^^^^^^^^^^^^^^
+(lambda) @anonymousFunction
+
+;;!! [1,2,3].each do |i| end
+;;!               ^^^^^^^^^^
+(do_block) @anonymousFunction
+
+(call
+  receiver: (_)? @_dummy_receiver
+  method: (_)? @_dummy_method
+  block: (_) @anonymousFunction
+  (#not-eq? @_dummy_receiver Proc)
+  (#not-eq? @_dummy_method lambda)
+  (#not-type? @anonymousFunction do_block)
+)
+
+;;!! Proc.new { puts "hi" }
+;;!  ^^^^^^^^^^^^^^^^^^^^^^
+(call
+  receiver: (_) @_dummy_receiver
+  method: (_) @_dummy_method
+  (#eq? @_dummy_receiver Proc)
+  (#eq? @_dummy_method new)
+) @anonymousFunction
+
+;;!! lambda { puts "hi" }
+;;!  ^^^^^^^^^^^^^^^^^^^^
+(call
+  method: (_) @_dummy
+  (#eq? @_dummy lambda)
+) @anonymousFunction