Migrate type

Author: AndreasArvidsson

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

@@ -1,82 +1,10 @@
-import type { SimpleScopeTypeType, TextEditor } from "@cursorless/common";
-import type { Node } from "web-tree-sitter";
-import type {
-  NodeMatcherAlternative,
-  SelectionWithContext,
-} from "../typings/Types";
-import { patternFinder } from "../util/nodeFinders";
-import {
-  argumentMatcher,
-  cascadingMatcher,
-  createPatternMatchers,
-  leadingMatcher,
-  matcher,
-  patternMatcher,
-} from "../util/nodeMatchers";
-import {
-  makeNodePairSelection,
-  makeRangeFromPositions,
-} from "../util/nodeSelectors";
-
-/**
- * Returns "impl_item[type]" node higher in the chain
- * @param node The node which we will start our search from
- * @returns node or null
- */
-function implItemTypeFinder(node: Node) {
-  if (
-    node.parent?.type === "impl_item" &&
-    node.parent?.childForFieldName("type")?.equals(node)
-  ) {
-    return node;
-  }
-  return null;
-}
-
-function traitBoundExtractor(
-  editor: TextEditor,
-  node: Node,
-): SelectionWithContext {
-  return {
-    selection: makeNodePairSelection(node.children[1], node.lastNamedChild!),
-    context: {
-      leadingDelimiterRange: makeRangeFromPositions(
-        node.children[0].startPosition,
-        node.children[1].startPosition,
-      ),
-    },
-  };
-}
+import type { SimpleScopeTypeType } from "@cursorless/common";
+import type { NodeMatcherAlternative } from "../typings/Types";
+import { argumentMatcher, createPatternMatchers } from "../util/nodeMatchers";
 
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {
-  type: cascadingMatcher(
-    leadingMatcher(
-      [
-        "let_declaration[type]",
-        "parameter[type]",
-        "field_declaration[type]",
-        "const_item[type]",
-      ],
-      [":"],
-    ),
-    matcher(
-      patternFinder(
-        "constrained_type_parameter[bounds]",
-        "where_predicate[bounds]",
-      ),
-      traitBoundExtractor,
-    ),
-    leadingMatcher(["function_item[return_type]"], ["->"]),
-    matcher(implItemTypeFinder),
-    patternMatcher(
-      "struct_item",
-      "trait_item",
-      "impl_item",
-      "array_type[element]",
-    ),
-  ),
   argumentOrParameter: argumentMatcher(
     "arguments",
     "parameters",

queries/rust.scm

@@ -113,30 +113,53 @@
   name: (_) @className @name
 ) @_.domain
 
+;;!! fn foo() {}
+;;!  ^^^^^^^^^^^
 (function_item
   name: (_) @functionName @name
 ) @namedFunction @_.domain
 
-(field_declaration
-  name: (_) @name
+;;!! fn foo() -> int {}
+;;!              ^^^
+(function_item
+  parameters: (_) @_.leading.endOf
+  return_type: (_)? @type
 ) @_.domain
 
-;;!! where T: Display + Clone
+;;!! fn foo<T: Display>() {}
+;;!         ^
+;;!            ^^^^^^^
+(constrained_type_parameter
+  left: (_) @name
+  (trait_bounds
+    ":" @type.leading.endOf
+    (_) @type.start
+    (_) @type.end
+  )
+) @_.domain
+
+;;!! where T: Display
 ;;!        ^
+;;!           ^^^^^^^
 (where_predicate
   left: (_) @name
+  (trait_bounds
+    ":" @type.leading.endOf
+    (_) @type.start
+    (_) @type.end
+  )
+) @_.domain
+
+(field_declaration
+  name: (_) @name @type.leading.endOf
+  type: (_) @type
 ) @_.domain
 
 ;;!! (t: &T, u: &U)
 ;;!   ^      ^
 (parameter
-  pattern: (_) @name
-) @_.domain
-
-;;!! <T: Display, U: Clone>
-;;!   ^           ^
-(constrained_type_parameter
-  left: (_) @name
+  pattern: (_) @name @type.leading.endOf
+  type: (_) @type
 ) @_.domain
 
 [
@@ -191,8 +214,8 @@
 ;;!! const foo: u8 = 2;
 ;;!                  ^
 (const_item
-  name: (_) @name
-  type: (_) @value.leading.endOf
+  name: (_) @name @type.leading.endOf
+  type: (_) @type @value.leading.endOf
   value: (_) @value
 ) @_.domain
 
@@ -209,8 +232,8 @@
 ;;!      ^^^
 ;;!            ^
 (let_declaration
-  pattern: (_) @name
-  type: (_) @value.leading.start.endOf
+  pattern: (_) @name @type.leading.endOf
+  type: (_) @type @value.leading.start.endOf
   value: (_) @value
 ) @_.domain
 
@@ -291,6 +314,20 @@
 ;;!                ^^^^^^^
 (match_arm) @branch
 
+[
+  (struct_item)
+  (trait_item)
+  (impl_item)
+] @type
+
+(impl_item
+  type: (_) @type
+)
+
+(array_type
+  element: (_) @type
+) @_.domain
+
 operator: [
   "<"
   "<<"