Migrate statement

Author: AndreasArvidsson

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

@@ -1,13 +1,11 @@
-import type { TextEditor } from "@cursorless/common";
+import type { SimpleScopeTypeType, TextEditor } from "@cursorless/common";
 import type { Node } from "web-tree-sitter";
-import type { SimpleScopeTypeType } from "@cursorless/common";
 import type {
   NodeMatcherAlternative,
   SelectionWithContext,
 } from "../typings/Types";
 import { patternFinder } from "../util/nodeFinders";
 import {
-  ancestorChainNodeMatcher,
   argumentMatcher,
   cascadingMatcher,
   createPatternMatchers,
@@ -50,11 +48,6 @@ const STATEMENT_TYPES = [
   "expression_statement",
 ];
 
-/**
- * Scope types allowed to be parents of a statement
- */
-const STATEMENT_PARENT_TYPES = ["source_file", "block", "declaration_list"];
-
 /**
  * Returns "impl_item[type]" node higher in the chain
  * @param node The node which we will start our search from
@@ -142,13 +135,6 @@ function returnValueFinder(node: Node) {
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {
-  statement: ancestorChainNodeMatcher(
-    [
-      patternFinder(...STATEMENT_PARENT_TYPES),
-      patternFinder(...STATEMENT_TYPES),
-    ],
-    1,
-  ),
   condition: cascadingMatcher(
     patternMatcher("while_expression[condition]", "if_expression[condition]"),
     matcher(

queries/rust.scm

@@ -2,35 +2,35 @@
 
 ;; Generated by the following command:
 ;; `curl https://raw.githubusercontent.com/tree-sitter/tree-sitter-rust/36ae187ed6dd3803a8a89dbb54f3124c8ee74662/src/node-types.STATEMENT_TYPES | jq '[.[] | select(.type == "_declaration_statement") | .subtypes[].type, "expression_statement"]'`
-;; (
-;;   (_
-;;     [
-;;       (associated_type)
-;;       (attribute_item)
-;;       (const_item)
-;;       (empty_statement)
-;;       (enum_item)
-;;       (extern_crate_declaration)
-;;       (foreign_mod_item)
-;;       (impl_item)
-;;       (inner_attribute_item)
-;;       (let_declaration)
-;;       (macro_definition)
-;;       (macro_invocation)
-;;       (function_item)
-;;       (function_signature_item)
-;;       (mod_item)
-;;       (static_item)
-;;       (struct_item)
-;;       (trait_item)
-;;       (type_item)
-;;       (union_item)
-;;       (use_declaration)
-;;       (expression_statement)
-;;     ] @statement
-;;   ) @_dummy
-;;   (#type? @_dummy source_file block declaration_list)
-;; )
+(
+  (_
+    [
+      (associated_type)
+      (attribute_item)
+      (const_item)
+      (empty_statement)
+      (enum_item)
+      (extern_crate_declaration)
+      (foreign_mod_item)
+      (impl_item)
+      (inner_attribute_item)
+      (let_declaration)
+      (macro_definition)
+      (macro_invocation)
+      (function_item)
+      (function_signature_item)
+      (mod_item)
+      (static_item)
+      (struct_item)
+      (trait_item)
+      (type_item)
+      (union_item)
+      (use_declaration)
+      (expression_statement)
+    ] @statement
+  ) @_dummy
+  (#type? @_dummy source_file block declaration_list)
+)
 
 [
   (if_expression)