Migrate condition

Author: AndreasArvidsson

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

@@ -14,7 +14,6 @@ import {
   patternMatcher,
 } from "../util/nodeMatchers";
 import {
-  childRangeSelector,
   makeNodePairSelection,
   makeRangeFromPositions,
 } from "../util/nodeSelectors";
@@ -53,16 +52,6 @@ function traitBoundExtractor(
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {
-  condition: cascadingMatcher(
-    patternMatcher("while_expression[condition]", "if_expression[condition]"),
-    matcher(
-      patternFinder("while_let_expression", "if_let_expression"),
-      childRangeSelector(["while", "if", "block"], [], {
-        includeUnnamedChildren: true,
-      }),
-    ),
-    leadingMatcher(["*.match_pattern![condition]"], ["if"]),
-  ),
   type: cascadingMatcher(
     leadingMatcher(
       [

queries/rust.scm

@@ -225,6 +225,42 @@
   )
 )
 
+;;!! if v < 0 {}
+;;!     ^^^^^
+(if_expression
+  condition: (_) @condition
+) @_.domain
+
+;;!! if let Some(i) = number {}
+;;!         ^^^^^^^^^^^^^^^^
+(if_let_expression
+  "let" @condition.start
+  value: (_) @condition.end
+) @_.domain
+
+;;!! while v < 0 {}
+;;!        ^^^^^
+(while_expression
+  condition: (_) @condition
+) @_.domain
+
+;;!! while let Some(i) = number {}
+;;!        ^^^^^^^^^^^^^^^^^^^^
+(while_let_expression
+  "let" @condition.start
+  value: (_) @condition.end
+) @_.domain
+
+;;!! User { value } if value.use() => {}
+;;!                    ^^^^^^^^^^^
+(_
+  (match_pattern
+    (_) @_.leading.endOf
+    .
+    condition: (_) @condition
+  )
+) @_.domain
+
 operator: [
   "<"
   "<<"