Migrate argument

Author: AndreasArvidsson

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

@@ -2,6 +2,6 @@
  * The language IDs that we have full tree-sitter support for using our legacy
  * modifiers.
  */
-export const legacyLanguageIds = ["clojure", "latex", "rust"] as const;
+export const legacyLanguageIds = ["latex", "rust"] as const;
 
 export type LegacyLanguageId = (typeof legacyLanguageIds)[number];

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

@@ -1,16 +1,15 @@
+import type { SimpleScopeTypeType } from "@cursorless/common";
 import { UnsupportedLanguageError } from "@cursorless/common";
 import type { Node } from "web-tree-sitter";
-import type { SimpleScopeTypeType } from "@cursorless/common";
 import type {
   NodeMatcher,
   NodeMatcherValue,
   SelectionWithEditor,
 } from "../typings/Types";
 import { notSupported } from "../util/nodeMatchers";
 import { selectionWithEditorFromRange } from "../util/selectionUtils";
-import clojure from "./clojure";
-import type { LegacyLanguageId } from "./LegacyLanguageId";
 import latex from "./latex";
+import type { LegacyLanguageId } from "./LegacyLanguageId";
 import rust from "./rust";
 
 export function getNodeMatcher(
@@ -41,7 +40,6 @@ export const languageMatchers: Record<
   LegacyLanguageId,
   Partial<Record<SimpleScopeTypeType, NodeMatcher>>
 > = {
-  clojure,
   latex,
   rust,
 };

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

@@ -80,17 +80,28 @@
   close: "}" @collectionItem.iteration.end.startOf
 ) @collectionItem.iteration.domain
 
-;;!! (hello)
-;;!  ^^^^^^^
+;;!! (foo)
+;;!  ^^^^^
 (
   (list_lit
     .
     value: (_) @functionCallee
-  ) @functionCall @functionCallee.domain
+  ) @functionCall @functionCallee.domain @argumentOrParameter.iteration
   ;; A function call is a list literal which is not quoted
   (#not-parent-type? @functionCall quoting_lit)
 )
 
+;;!! (foo :bar)
+;;!       ^^^^
+(
+  (list_lit
+    .
+    value: (_)
+    value: (_) @argumentOrParameter
+  ) @_dummy
+  (#not-parent-type? @_dummy quoting_lit)
+)
+
 ;;!! (defn foo [] 5)
 ;;!  ^^^^^^^^^^^^^^^
 ;;!        ^^^