Migrate statement

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", "ruby", "rust"] as const;
+export const legacyLanguageIds = ["clojure", "latex", "rust"] as const;
 
 export type LegacyLanguageId = (typeof legacyLanguageIds)[number];

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

@@ -7,10 +7,24 @@ import { QueryPredicateOperator } from "./QueryPredicateOperator";
 import { q } from "./operatorArgumentSchemaTypes";
 
 /**
- * A predicate operator that returns true if the node is not of the given type.
- * For example, `(not-type? @foo string)` will reject the match if the `@foo`
+ * A predicate operator that returns true if the node is of the given type.
+ * For example, `(#is-type? @foo string)` will accept the match if the `@foo`
  * capture is a `string` node. It is acceptable to pass in multiple types, e.g.
- * `(not-type? @foo string comment)`.
+ * `(#is-type? @foo string comment)`.
+ */
+class IsType extends QueryPredicateOperator<IsType> {
+  name = "is-type?" as const;
+  schema = z.tuple([q.node, q.string]).rest(q.string);
+  run({ node }: MutableQueryCapture, ...types: string[]) {
+    return types.includes(node.type);
+  }
+}
+
+/**
+ * A predicate operator that returns true if the node is NOT of the given type.
+ * For example, `(#not-type? @foo string)` will reject the match if the `@foo`
+ * capture is a `string` node. It is acceptable to pass in multiple types, e.g.
+ * `(#not-type? @foo string comment)`.
  */
 class NotType extends QueryPredicateOperator<NotType> {
   name = "not-type?" as const;
@@ -22,9 +36,9 @@ class NotType extends QueryPredicateOperator<NotType> {
 
 /**
  * A predicate operator that returns true if the node's parent is not of the
- * given type. For example, `(not-parent-type? @foo string)` will reject the
+ * given type. For example, `(#not-parent-type? @foo string)` will reject the
  * match if the `@foo` capture is a child of a `string` node. It is acceptable
- * to pass in multiple types, e.g. `(not-parent-type? @foo string comment)`.
+ * to pass in multiple types, e.g. `(#not-parent-type? @foo string comment)`.
  */
 class NotParentType extends QueryPredicateOperator<NotParentType> {
   name = "not-parent-type?" as const;
@@ -36,7 +50,7 @@ class NotParentType extends QueryPredicateOperator<NotParentType> {
 
 /**
  * A predicate operator that returns true if the node is the nth child of its
- * parent.  For example, `(is-nth-child? @foo 0)` will reject the match if the
+ * parent.  For example, `(#is-nth-child? @foo 0)` will reject the match if the
  * `@foo` capture is not the first child of its parent.
  */
 class IsNthChild extends QueryPredicateOperator<IsNthChild> {
@@ -49,7 +63,7 @@ class IsNthChild extends QueryPredicateOperator<IsNthChild> {
 
 /**
  * A predicate operator that returns true if the node has more than 1 child of
- * type {@link type} (inclusive).  For example, `(has-multiple-children-of-type?
+ * type {@link type} (inclusive).  For example, `(#has-multiple-children-of-type?
  * @foo bar)` will accept the match if the `@foo` capture has 2 or more children
  * of type `bar`.
  */
@@ -374,6 +388,7 @@ class EmptySingleMultiDelimiter extends QueryPredicateOperator<EmptySingleMultiD
 
 export const queryPredicateOperators = [
   new Log(),
+  new IsType(),
   new NotType(),
   new TrimEnd(),
   new DocumentRange(),

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

@@ -11,7 +11,6 @@ import { selectionWithEditorFromRange } from "../util/selectionUtils";
 import clojure from "./clojure";
 import type { LegacyLanguageId } from "./LegacyLanguageId";
 import latex from "./latex";
-import { patternMatchers as ruby } from "./ruby";
 import rust from "./rust";
 
 export function getNodeMatcher(
@@ -44,7 +43,6 @@ export const languageMatchers: Record<
 > = {
   clojure,
   latex,
-  ruby,
   rust,
 };
 

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

@@ -1,5 +1,108 @@
 ;; https://github.com/tree-sitter/tree-sitter-ruby/blob/master/src/grammar.json
 
+;; Generated by the following command:
+;; curl https://raw.githubusercontent.com/tree-sitter/tree-sitter-ruby/1ebfdb288842dae5a9233e2509a135949023dd82/src/node-types.json  \
+;; | jq '[.[] | select((.type == "_statement" or .type == "_simple_statement") and .type != "_expression") | .subtypes[] | select(.type != "_expression") | .type ]'
+[
+  (alias)
+  (begin_block)
+  (end_block)
+  (if_modifier)
+  (rescue_modifier)
+  (undef)
+  (unless_modifier)
+  (until_modifier)
+  (while_modifier)
+] @statement
+
+;; Generated by the following command:
+;; > curl https://raw.githubusercontent.com/tree-sitter/tree-sitter-ruby/1ebfdb288842dae5a9233e2509a135949023dd82/src/node-types.json \
+;;   | jq '[.[] | select(.type == _expression or .type == _arg or .type == _primary or .type == _lhs or .type == _simple_numeric or .type == _variable or .type == _nonlocal_variable) | .subtypes[].type | select(startswith(_) | not)] | sort | unique'
+(
+  (_
+    [
+      (array)
+      (assignment)
+      (begin)
+      (binary)
+      (break)
+      (call)
+      (case)
+      (case_match)
+      (chained_string)
+      (character)
+      (class)
+      (class_variable)
+      (complex)
+      (conditional)
+      (constant)
+      (delimited_symbol)
+      (element_reference)
+      (false)
+      (float)
+      (for)
+      (global_variable)
+      (hash)
+      (heredoc_beginning)
+      (identifier)
+      (if)
+      (instance_variable)
+      (integer)
+      (lambda)
+      (method)
+      (module)
+      (next)
+      (nil)
+      (operator_assignment)
+      (parenthesized_statements)
+      (range)
+      (rational)
+      (redo)
+      (regex)
+      (retry)
+      (return)
+      (scope_resolution)
+      (self)
+      (simple_symbol)
+      (singleton_class)
+      (singleton_method)
+      (string)
+      (string_array)
+      (subshell)
+      (super)
+      (symbol_array)
+      (true)
+      (unary)
+      (unless)
+      (until)
+      (while)
+      (yield)
+    ] @statement
+  ) @_dummy
+  (#is-type?
+    @_dummy
+    begin_block
+    begin
+    block_body
+    block
+    body_statement
+    do_block
+    do
+    else
+    end_block
+    ensure
+    heredoc_beginning
+    interpolation
+    lambda
+    method
+    parenthesized_statements
+    program
+    singleton_class
+    singleton_method
+    then
+  )
+)
+
 (comment) @comment @textFragment
 (hash) @map
 (regex) @regularExpression
@@ -238,5 +341,3 @@ operator: [
   ) @_dummy
   (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
 ) @argumentList.domain @argumentOrParameter.iteration.domain
-
-;; lambda_parameters