Migrate argument

Author: AndreasArvidsson

data/fixtures/recorded/languages/ruby/chuckArg3.yml

@@ -19,7 +19,7 @@ initialState:
   marks: {}
 finalState:
   documentContents: |
-    [1, 2, 3].each_with_the_next { |n, | }
+    [1, 2, 3].each_with_the_next { |n| }
   selections:
-    - anchor: {line: 0, character: 35}
-      active: {line: 0, character: 35}
+    - anchor: {line: 0, character: 33}
+      active: {line: 0, character: 33}

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

@@ -3,7 +3,6 @@ import type { NodeMatcherAlternative } from "../typings/Types";
 import { patternFinder } from "../util/nodeFinders";
 import {
   ancestorChainNodeMatcher,
-  argumentMatcher,
   cascadingMatcher,
   createPatternMatchers,
   patternMatcher,
@@ -108,24 +107,6 @@ const EXPRESSION_STATEMENT_PARENT_TYPES = [
   "then",
 ];
 
-const assignmentOperators = [
-  "=",
-  "+=",
-  "-=",
-  "*=",
-  "**=",
-  "/=",
-  "||=",
-  "|=",
-  "&&=",
-  "&=",
-  "%=",
-  ">>=",
-  "<<=",
-  "^=",
-];
-const mapKeyValueSeparators = [":", "=>"];
-
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {
@@ -139,11 +120,5 @@ const nodeMatchers: Partial<
       1,
     ),
   ),
-  argumentOrParameter: argumentMatcher(
-    "lambda_parameters",
-    "method_parameters",
-    "block_parameters",
-    "argument_list",
-  ),
 };
 export const patternMatchers = createPatternMatchers(nodeMatchers);

queries/ruby.scm

@@ -169,3 +169,74 @@ operator: [
   left: (_) @_.leading.endOf
   right: (_) @value
 ) @_.domain
+
+;;!! def foo(aaa, bbb)
+;;!          ^^^  ^^^
+(
+  (method_parameters
+    (_)? @_.leading.endOf
+    .
+    (_) @argumentOrParameter
+    .
+    (_)? @_.trailing.startOf
+  ) @_dummy
+  (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
+)
+
+;;!! foo(aaa, bbb)
+;;!      ^^^  ^^^
+(
+  (argument_list
+    (_)? @_.leading.endOf
+    .
+    (_) @argumentOrParameter
+    .
+    (_)? @_.trailing.startOf
+  ) @_dummy
+  (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
+)
+
+;;!! { |aaa, bbb| }
+;;!     ^^^  ^^^
+(
+  (block_parameters
+    (_)? @_.leading.endOf
+    .
+    (_) @argumentOrParameter
+    .
+    (_)? @_.trailing.startOf
+  ) @_dummy
+  (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
+)
+
+;;!! def foo(aaa, bbb)
+;;!          ^^^^^^^^
+(_
+  (method_parameters
+    "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
+    ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
+  ) @_dummy
+  (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
+) @argumentList.domain @argumentOrParameter.iteration.domain
+
+;;!! foo(aaa, bbb)
+;;!      ^^^^^^^^
+(_
+  (argument_list
+    "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
+    ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
+  ) @_dummy
+  (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
+) @argumentList.domain @argumentOrParameter.iteration.domain
+
+;;!! { |aaa, bbb| }
+;;!     ^^^^^^^^
+(_
+  (block_parameters
+    "|" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
+    "|" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
+  ) @_dummy
+  (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
+) @argumentList.domain @argumentOrParameter.iteration.domain
+
+;; lambda_parameters