Migrate branch

Author: AndreasArvidsson

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

@@ -17,7 +17,6 @@ import {
   makeNodePairSelection,
   makeRangeFromPositions,
 } from "../util/nodeSelectors";
-import { elseExtractor, elseIfExtractor } from "./elseIfExtractor";
 
 /**
  * Returns "impl_item[type]" node higher in the chain
@@ -85,11 +84,6 @@ const nodeMatchers: Partial<
     "type_parameters",
     "ordered_field_declaration_list",
   ),
-  branch: cascadingMatcher(
-    patternMatcher("match_arm"),
-    matcher(patternFinder("else_clause"), elseExtractor("if_expression")),
-    matcher(patternFinder("if_expression"), elseIfExtractor()),
-  ),
 };
 
 export default createPatternMatchers(nodeMatchers);

queries/java.scm

@@ -194,8 +194,8 @@
   (if_statement
     "if" @branch.start @branch.removal.start
     condition: (_) @condition
-    consequence: (block) @branch.end @branch.removal.end
-    alternative: (if_statement)? @branch.removal.end.startOf
+    consequence: (_) @branch.end @branch.removal.end
+    alternative: (_)? @branch.removal.end.startOf
   ) @condition.domain
   (#not-parent-type? @condition.domain "if_statement")
   (#child-range! @condition 0 -1 true true)
@@ -207,7 +207,7 @@
   "else" @branch.start @condition.domain.start
   alternative: (if_statement
     condition: (_) @condition
-    consequence: (block) @branch.end @condition.domain.end
+    consequence: (_) @branch.end @condition.domain.end
     (#child-range! @condition 0 -1 true true)
   )
 )
@@ -216,7 +216,7 @@
 ;;!  ^^^^^^^
 (if_statement
   "else" @branch.start
-  alternative: (block) @branch.end
+  alternative: (_) @branch.end
 )
 
 (

queries/rust.scm

@@ -32,10 +32,49 @@
   (#type? @_dummy source_file block declaration_list)
 )
 
-[
-  (if_expression)
-  (if_let_expression)
-] @ifStatement
+;;!! if v < 0 {}
+;;!  ^^^^^^^^^^^
+(if_expression) @ifStatement
+
+;;!! if let Some(i) = number {}
+;;!  ^^^^^^^^^^^^^^^^^^^^^^^^^^
+;;!         ^^^^^^^^^^^^^^^^
+(if_let_expression
+  "let" @condition.start
+  value: (_) @condition.end
+) @ifStatement @_.domain
+
+;;!! if true {}
+;;!  ^^^^^^^^^^
+(_
+  (if_expression
+    "if" @branch.start @branch.removal.start
+    condition: (_) @condition
+    consequence: (_) @branch.end @branch.removal.end
+    alternative: (else_clause
+      (if_expression) @branch.removal.end.startOf
+    )?
+  ) @condition.domain
+  (#not-parent-type? @condition.domain else_clause)
+)
+
+;;!! else if true {}
+;;!  ^^^^^^^^^^^^^^^
+(else_clause
+  "else" @branch.start @condition.domain.start
+  (if_expression
+    condition: (_) @condition
+    consequence: (_) @branch.end @condition.domain.end
+  )
+)
+
+;;!! else {}
+;;!  ^^^^^^^
+(
+  (else_clause
+    (block)
+  ) @branch
+)
 
 ;;!! "hello"
 (
@@ -225,19 +264,6 @@
   )
 )
 
-;;!! 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
@@ -261,6 +287,10 @@
   )
 ) @_.domain
 
+;;!! match value { 5 => {} }
+;;!                ^^^^^^^
+(match_arm) @branch
+
 operator: [
   "<"
   "<<"