WIP

Author: purpleP

cursorless-talon/src/modifiers/containing_scope.py

@@ -39,6 +39,8 @@
     "selector": "selector",
     "state": "statement",
     "string": "string",
+    "subject": "subject",
+    "branch": "branch",
     "type": "type",
     "value": "value",
     "condition": "condition",

schemas/cursorless-snippets.json

@@ -73,11 +73,13 @@
 				"argumentOrParameter",
 				"anonymousFunction",
 				"attribute",
+				"branch",
 				"class",
 				"className",
 				"collectionItem",
 				"collectionKey",
 				"comment",
+				"condition",
 				"functionCall",
 				"functionName",
 				"ifStatement",
@@ -88,6 +90,7 @@
 				"regularExpression",
 				"statement",
 				"string",
+				"subject",
 				"type",
 				"value",
 				"condition",

src/languages/rust.ts

@@ -186,6 +186,8 @@ const nodeMatchers: Partial<
     "meta_arguments",
     "type_parameters"
   ),
+  collectionKey: ["match_pattern"],
+  condition: ["match_pattern"],
   name: [
     "let_declaration.identifier!",
     "parameter.identifier!",
@@ -198,15 +200,18 @@ const nodeMatchers: Partial<
     "let_declaration[pattern]",
     "constrained_type_parameter[left]",
     "where_predicate[left]",
+    "match_pattern",
   ],
   class: ["struct_item", "struct_expression", "enum_item"],
   className: ["struct_item[name]", "enum_item[name]", "trait_item[name]"],
   value: cascadingMatcher(
     leadingMatcher(["let_declaration[value]"], ["="]),
-    patternMatcher("meta_item[value]"),
+    patternMatcher("meta_item[value]", "match_arm[value]"),
     matcher(returnValueFinder)
   ),
   attribute: trailingMatcher(["mutable_specifier", "attribute_item"]),
+  subject: "match_expression[value]",
+  branch: "match_arm",
 };
 
 export default createPatternMatchers(nodeMatchers);

src/typings/targetDescriptor.types.ts

@@ -69,11 +69,13 @@ export type SimpleScopeTypeType =
   | "argumentOrParameter"
   | "anonymousFunction"
   | "attribute"
+  | "branch"
   | "class"
   | "className"
   | "collectionItem"
   | "collectionKey"
   | "comment"
+  | "condition"
   | "functionCall"
   | "functionCallee"
   | "functionName"
@@ -96,6 +98,7 @@ export type SimpleScopeTypeType =
   | "sectionLevelFive"
   | "sectionLevelSix"
   | "selector"
+  | "subject"
   | "xmlBothTags"
   | "xmlElement"
   | "xmlEndTag"