Migrate value

Author: AndreasArvidsson

data/fixtures/recorded/languages/rust/clearValue3.yml

@@ -21,33 +21,6 @@ import {
 } from "../util/nodeSelectors";
 import { elseExtractor, elseIfExtractor } from "./elseIfExtractor";
 
-// 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"]'`
-const STATEMENT_TYPES = [
-  "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",
-];
-
 /**
  * Returns "impl_item[type]" node higher in the chain
  * @param node The node which we will start our search from
@@ -78,60 +51,6 @@ function traitBoundExtractor(
   };
 }
 
-/**
- * Returns the return value node for a given block if we are in a block that has
- * a return value. If the return value expression uses the return keyword then
- * we return the value itself otherwise we just return the expression
- * @param node The node which we might match
- * @returns The return value node
- */
-function returnValueFinder(node: Node) {
-  if (node.type !== "block") {
-    return null;
-  }
-
-  const { lastNamedChild } = node;
-
-  // The return expression will always be the last statement or expression in
-  // the block
-  if (lastNamedChild == null) {
-    return null;
-  }
-
-  // If the final name child is an expression statement not a raw expression
-  // then we only treat it as a return value if it is a return expression.
-  // Otherwise it is just a normal statement that doesn't return anything
-  if (lastNamedChild.type === "expression_statement") {
-    const expression = lastNamedChild.child(0)!;
-
-    if (expression.type === "return_expression") {
-      return expression.child(1);
-    }
-
-    return null;
-  }
-
-  // Any other type of statement is not a return statement so we should not
-  // match it
-  if (STATEMENT_TYPES.includes(lastNamedChild.type)) {
-    return null;
-  }
-
-  // NB: At this point we have now excluded all statement types of the only other
-  // possible node is an expression node
-
-  // If it is a return expression then we zoom down to the actual value of the
-  // return expression. This happens when they say `return foo` with no
-  // trailing semicolon
-  if (lastNamedChild.type === "return_expression") {
-    return lastNamedChild.child(1);
-  }
-
-  // At this point it is an expression which is not a return expression so we
-  // just return it as the return value of the block
-  return lastNamedChild;
-}
-
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {
@@ -196,15 +115,6 @@ const nodeMatchers: Partial<
     ),
     trailingMatcher(["field_initializer[name]", "field_pattern[name]"], [":"]),
   ),
-  value: cascadingMatcher(
-    leadingMatcher(["let_declaration[value]"], ["="]),
-    leadingMatcher(
-      ["field_initializer[value]", "field_pattern[pattern]"],
-      [":"],
-    ),
-    patternMatcher("meta_item[value]", "const_item[value]"),
-    matcher(returnValueFinder),
-  ),
   branch: cascadingMatcher(
     patternMatcher("match_arm"),
     matcher(patternFinder("else_clause"), elseExtractor("if_expression")),

data/fixtures/recorded/languages/rust/clearValue6.yml

@@ -109,18 +109,85 @@
 
 ;;!! let Foo {aaa: 1, bbb: 2}
 ;;!           ^^^     ^^^
+;;!                ^       ^
 (field_initializer
-  name: (_) @collectionKey
-  value: (_) @_.trailing.startOf
+  name: (_) @collectionKey @value.leading.endOf
+  value: (_) @value @collectionKey.trailing.startOf
 ) @_.domain
 
 ;;!! Foo {aaa: 1, bbb: 2}
 ;;!       ^^^     ^^^
+;;!            ^       ^
 (field_pattern
-  name: (_) @collectionKey
-  pattern: (_) @_.trailing.startOf
+  name: (_) @collectionKey @value.leading.endOf
+  pattern: (_) @value @collectionKey.trailing.startOf
 ) @_.domain
 
+;;!! const foo: u8 = 2;
+;;!                  ^
+(const_item
+  (_) @value.leading.endOf
+  .
+  value: (_) @value
+) @_.domain
+
+;;!! let foo = 2;
+;;!            ^
+(let_declaration
+  (_) @value.leading.endOf
+  .
+  value: (_) @value
+) @_.domain
+
+;;!! #[cfg_attr(feature = "foo")]
+;;!                       ^^^^^
+(meta_item
+  (_) @value.leading.endOf
+  value: (_) @value
+) @_.domain
+
+;;!! return 2;
+;;!         ^
+(return_expression
+  (_) @value
+) @_.domain
+
+;; Implicit return value at end of function body
+(function_item
+  body: (_
+    (_) @value
+    .
+  )
+  (#not-type?
+    @value
+    ;; Exclude return expression
+    return_expression
+    ;; Exclude all statements
+    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
+  )
+)
+
 operator: [
   "<"
   "<<"