Added try branch for java (#2346)

* Added branch scope for try catch statements in java
* Added missing iteration scope for if else branch in java

## Checklist

- [x] I have added
[tests](https://www.cursorless.org/docs/contributing/test-ca/e-recorder/)
- [/] I have updated the
[docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and
[cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet)
- [/] I have not broken the cheatsheet

data/fixtures/scopes/java/branch.if.iteration.scope

@@ -0,0 +1,12 @@
+if (true) {}
+else if (false) {}
+else {}
+---
+
+[Range] =
+[Domain] = 0:0-2:7
+  >------------
+0| if (true) {}
+1| else if (false) {}
+2| else {}
+   -------<

data/fixtures/scopes/java/branch.if.scope

@@ -0,0 +1,35 @@
+if (true) {}
+else if (false) {}
+else {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:12
+  >------------<
+0| if (true) {}
+
+[#1 Removal] = 0:0-1:5
+  >------------
+0| if (true) {}
+1| else if (false) {}
+   -----<
+
+[#1 Insertion delimiter] = "\n"
+
+
+[#2 Content] =
+[#2 Removal] =
+[#2 Domain] = 1:0-1:18
+  >------------------<
+1| else if (false) {}
+
+[#2 Insertion delimiter] = "\n"
+
+
+[#3 Content] =
+[#3 Removal] =
+[#3 Domain] = 2:0-2:7
+  >-------<
+2| else {}
+
+[#3 Insertion delimiter] = "\n"

data/fixtures/scopes/java/branch.try.iteration.scope

@@ -0,0 +1,12 @@
+try {}
+catch(Exception e) {}
+finally {}
+---
+
+[Range] =
+[Domain] = 0:0-2:10
+  >------
+0| try {}
+1| catch(Exception e) {}
+2| finally {}
+   ----------<

data/fixtures/scopes/java/branch.try.scope

@@ -0,0 +1,30 @@
+try {}
+catch(Exception e) {}
+finally {}
+---
+
+[#1 Content] =
+[#1 Removal] =
+[#1 Domain] = 0:0-0:6
+  >------<
+0| try {}
+
+[#1 Insertion delimiter] = "\n"
+
+
+[#2 Content] =
+[#2 Removal] =
+[#2 Domain] = 1:0-1:21
+  >---------------------<
+1| catch(Exception e) {}
+
+[#2 Insertion delimiter] = "\n"
+
+
+[#3 Content] =
+[#3 Removal] =
+[#3 Domain] = 2:0-2:10
+  >----------<
+2| finally {}
+
+[#3 Insertion delimiter] = "\n"

packages/common/src/scopeSupportFacets/java.ts

@@ -28,4 +28,9 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   attribute: notApplicable,
   "key.attribute": notApplicable,
   "value.attribute": notApplicable,
+
+  "branch.if": supported,
+  "branch.if.iteration": supported,
+  "branch.try": supported,
+  "branch.try.iteration": supported,
 };

packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts

@@ -310,6 +310,12 @@ export const scopeSupportFacetInfos: Record<
     description: "A try/catch/finally branch",
     scopeType: "branch",
   },
+  "branch.try.iteration": {
+    description:
+      "Iteration scope for try/catch/finally branch; should be the entire try-catch statement",
+    scopeType: "branch",
+    isIteration: true,
+  },
   "branch.switchCase": {
     description: "A case/default branch in a switch/match statement",
     scopeType: "branch",

packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts

@@ -79,6 +79,7 @@ const scopeSupportFacets = [
   "branch.if",
   "branch.if.iteration",
   "branch.try",
+  "branch.try.iteration",
   "branch.switchCase",
   "branch.switchCase.iteration",
   "branch.ternary",

queries/java.scm

@@ -155,6 +155,28 @@
   alternative: (block) @branch.end
 )
 
+(
+  (if_statement) @branch.iteration
+  (#not-parent-type? @branch.iteration "if_statement")
+)
+
+;;!! try {}
+;;!  ^^^^^^
+(try_statement
+  "try" @branch.start
+  body: (_) @branch.end
+)
+
+;;!! catch (Exception e) {}
+;;!  ^^^^^^^^^^^^^^^^^^^^^^
+(catch_clause) @branch
+
+;;!! finally {}
+;;!  ^^^^^^^^^^
+(finally_clause) @branch
+
+(try_statement) @branch.iteration
+
 ;;!! for (int i = 0; i < 5; ++i) {}
 ;;!                  ^^^^^
 ;;!  ------------------------------