Migrate if statement

Author: AndreasArvidsson

packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts

@@ -6,6 +6,21 @@ import type { MutableQueryCapture } from "./QueryCapture";
 import { QueryPredicateOperator } from "./QueryPredicateOperator";
 import { q } from "./operatorArgumentSchemaTypes";
 
+/**
+ * A predicate operator that returns true if the node matches the given text.
+ * For example, `(#text? @foo bar)` will accept the match if the `@foo`
+ * captures text is `bar`. It is acceptable to pass in multiple texts, e.g.
+ * `(#text? @foo bar baz)`.
+ */
+class Text extends QueryPredicateOperator<Text> {
+  name = "text?" as const;
+  schema = z.tuple([q.node, q.string]).rest(q.string);
+  run({ node, document, range }: MutableQueryCapture, ...texts: string[]) {
+    const text = document.getText(range);
+    return texts.includes(text);
+  }
+}
+
 /**
  * A predicate operator that returns true if the node is of the given type.
  * For example, `(#type? @foo string)` will accept the match if the `@foo`
@@ -388,6 +403,7 @@ class EmptySingleMultiDelimiter extends QueryPredicateOperator<EmptySingleMultiD
 
 export const queryPredicateOperators = [
   new Log(),
+  new Text(),
   new Type(),
   new NotType(),
   new TrimEnd(),

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

@@ -111,15 +111,6 @@ const functionNameMatcher = chainedMatcher([
   (functionNode) => getValueNodes(functionNode)[1],
 ]);
 
-const ifStatementFinder = functionNameBasedFinder(
-  "if",
-  "if-let",
-  "when",
-  "when-let",
-);
-
-const ifStatementMatcher = matcher(ifStatementFinder);
-
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {
@@ -150,13 +141,6 @@ const nodeMatchers: Partial<
     functionNameBasedMatcher("fn"),
     patternMatcher("anon_fn_lit"),
   ),
-
-  ifStatement: ifStatementMatcher,
-
-  condition: chainedMatcher([
-    ifStatementFinder,
-    (node) => getValueNodes(node)[1],
-  ]),
 };
 
 export default createPatternMatchers(nodeMatchers);

queries/clojure.scm

@@ -79,3 +79,13 @@
   open: "{" @collectionItem.iteration.start.endOf
   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