Add branch scope type

Author: pokey

cursorless-talon/src/modifiers/scopes.py

@@ -46,6 +46,7 @@
     "selector": "selector",
     "state": "statement",
     "string": "string",
+    "branch": "branch",
     "type": "type",
     "value": "value",
     "condition": "condition",

schemas/cursorless-snippets.json

@@ -73,6 +73,7 @@
 				"argumentOrParameter",
 				"anonymousFunction",
 				"attribute",
+				"branch",
 				"class",
 				"className",
 				"collectionItem",

src/languages/java.ts

@@ -114,6 +114,7 @@ const nodeMatchers: Partial<
   ),
   condition: conditionMatcher("*[condition]"),
   argumentOrParameter: argumentMatcher("formal_parameters", "argument_list"),
+  branch: ["switch_block_statement_group", "switch_rule"],
 };
 
 export default createPatternMatchers(nodeMatchers);

src/languages/python.ts

@@ -137,6 +137,7 @@ const nodeMatchers: Partial<
     argumentMatcher("parameters", "argument_list"),
     matcher(patternFinder("call.generator_expression!"), childRangeSelector()),
   ),
+  branch: "case_clause",
 };
 
 export default createPatternMatchers(nodeMatchers);

src/languages/rust.ts

@@ -218,6 +218,7 @@ const nodeMatchers: Partial<
     matcher(returnValueFinder),
   ),
   attribute: trailingMatcher(["mutable_specifier", "attribute_item"]),
+  branch: ["match_arm", "if_expression[consequence]", "else_clause.block!"],
 };
 
 export default createPatternMatchers(nodeMatchers);

src/languages/scala.ts

@@ -34,6 +34,7 @@ const nodeMatchers: Partial<
     "class_parameters",
     "bindings",
   ),
+  branch: "case_clause",
 
   name: ["*[name]", "*[pattern]"],
   functionName: "function_definition[name]",

src/processTargets/targets/ScopeTypeTarget.ts

@@ -169,6 +169,7 @@ function getDelimiter(scopeType: SimpleScopeTypeType): string {
     case "comment":
     case "xmlElement":
     case "collectionItem":
+    case "branch":
       return "\n";
 
     default:

src/test/suite/fixtures/recorded/languages/java/clearBranch.yml

@@ -0,0 +1,42 @@
+languageId: java
+command:
+  spokenForm: clear branch
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: branch}
+  usePrePhraseSnapshot: true
+  action: {name: clearAndSetSelection}
+initialState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        switch ("0") {
+          case ("0"):
+            break;
+          case ("1"):
+            break;
+        }
+      }
+    }
+  selections:
+    - anchor: {line: 4, character: 12}
+      active: {line: 4, character: 12}
+  marks: {}
+finalState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        switch ("0") {
+          
+          case ("1"):
+            break;
+        }
+      }
+    }
+  selections:
+    - anchor: {line: 3, character: 6}
+      active: {line: 3, character: 6}
+fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]

src/test/suite/fixtures/recorded/languages/java/clearBranch2.yml

@@ -0,0 +1,41 @@
+languageId: java
+command:
+  spokenForm: clear branch
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: branch}
+  usePrePhraseSnapshot: true
+  action: {name: clearAndSetSelection}
+initialState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        var s =
+          switch ("0") {
+            case "0" -> "zero";
+            case "1" -> "one";
+          };
+      }
+    }
+  selections:
+    - anchor: {line: 4, character: 23}
+      active: {line: 4, character: 23}
+  marks: {}
+finalState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        var s =
+          switch ("0") {
+            
+            case "1" -> "one";
+          };
+      }
+    }
+  selections:
+    - anchor: {line: 4, character: 8}
+      active: {line: 4, character: 8}
+fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]

src/test/suite/fixtures/recorded/languages/java/pourBranch.yml

@@ -0,0 +1,42 @@
+languageId: java
+command:
+  spokenForm: pour branch
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: branch}
+  usePrePhraseSnapshot: true
+  action: {name: editNewLineAfter}
+initialState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        var s =
+          switch ("0") {
+            case "0" -> "zero";
+            case "1" -> "one";
+          };
+      }
+    }
+  selections:
+    - anchor: {line: 4, character: 21}
+      active: {line: 4, character: 21}
+  marks: {}
+finalState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        var s =
+          switch ("0") {
+            case "0" -> "zero";
+            
+            case "1" -> "one";
+          };
+      }
+    }
+  selections:
+    - anchor: {line: 5, character: 8}
+      active: {line: 5, character: 8}
+fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]

src/test/suite/fixtures/recorded/languages/python/clearBranch.yml

@@ -0,0 +1,32 @@
+languageId: python
+command:
+  spokenForm: clear branch
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: branch}
+  usePrePhraseSnapshot: true
+  action: {name: clearAndSetSelection}
+initialState:
+  documentContents: |
+    match 0:
+        case [0]:
+            pass
+        case [1]:
+            pass
+  selections:
+    - anchor: {line: 2, character: 10}
+      active: {line: 2, character: 10}
+  marks: {}
+finalState:
+  documentContents: |
+    match 0:
+        
+        case [1]:
+            pass
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
+fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]

src/test/suite/fixtures/recorded/languages/rust/changeBranchOne.yml

@@ -0,0 +1,46 @@
+languageId: rust
+command:
+  spokenForm: change branch one
+  version: 2
+  targets:
+    - type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: '1'}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: branch}
+  usePrePhraseSnapshot: true
+  action: {name: clearAndSetSelection}
+initialState:
+  documentContents: |
+    fn main() {
+        let foo = if true {
+            1
+        } else if false {
+            2
+        } else {
+            3
+        };
+    }
+  selections:
+    - anchor: {line: 3, character: 20}
+      active: {line: 5, character: 5}
+  marks:
+    default.1:
+      start: {line: 2, character: 8}
+      end: {line: 2, character: 9}
+finalState:
+  documentContents: |
+    fn main() {
+        let foo = if true  else if false {
+            2
+        } else {
+            3
+        };
+    }
+  selections:
+    - anchor: {line: 1, character: 22}
+      active: {line: 1, character: 22}
+  thatMark:
+    - anchor: {line: 1, character: 22}
+      active: {line: 1, character: 22}
+fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '1'}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]

src/test/suite/fixtures/recorded/languages/rust/changeBranchThree.yml

@@ -0,0 +1,46 @@
+languageId: rust
+command:
+  spokenForm: change branch three
+  version: 2
+  targets:
+    - type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: '3'}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: branch}
+  usePrePhraseSnapshot: true
+  action: {name: clearAndSetSelection}
+initialState:
+  documentContents: |
+    fn main() {
+        let foo = if true {
+            1
+        } else if false {
+            2
+        } else {
+            3
+        };
+    }
+  selections:
+    - anchor: {line: 3, character: 20}
+      active: {line: 5, character: 5}
+  marks:
+    default.3:
+      start: {line: 6, character: 8}
+      end: {line: 6, character: 9}
+finalState:
+  documentContents: |
+    fn main() {
+        let foo = if true {
+            1
+        } else if false {
+            2
+        } else ;
+    }
+  selections:
+    - anchor: {line: 5, character: 11}
+      active: {line: 5, character: 11}
+  thatMark:
+    - anchor: {line: 5, character: 11}
+      active: {line: 5, character: 11}
+fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '3'}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]

src/test/suite/fixtures/recorded/languages/rust/changeBranchTwo.yml

@@ -0,0 +1,46 @@
+languageId: rust
+command:
+  spokenForm: change branch two
+  version: 2
+  targets:
+    - type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: '2'}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: branch}
+  usePrePhraseSnapshot: true
+  action: {name: clearAndSetSelection}
+initialState:
+  documentContents: |
+    fn main() {
+        let foo = if true {
+            1
+        } else if false {
+            2
+        } else {
+            3
+        };
+    }
+  selections:
+    - anchor: {line: 3, character: 20}
+      active: {line: 5, character: 5}
+  marks:
+    default.2:
+      start: {line: 4, character: 8}
+      end: {line: 4, character: 9}
+finalState:
+  documentContents: |
+    fn main() {
+        let foo = if true {
+            1
+        } else if false  else {
+            3
+        };
+    }
+  selections:
+    - anchor: {line: 3, character: 20}
+      active: {line: 3, character: 20}
+  thatMark:
+    - anchor: {line: 3, character: 20}
+      active: {line: 3, character: 20}
+fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '2'}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]

src/test/suite/fixtures/recorded/languages/scala/changeBranch.yml

@@ -0,0 +1,37 @@
+languageId: scala
+command:
+  spokenForm: change branch
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: branch}
+  usePrePhraseSnapshot: true
+  action: {name: clearAndSetSelection}
+initialState:
+  documentContents: |
+    def matchTest(x: Int): String = x match {
+      case 0 => "zero"
+      case 1 => "one"
+      case 2 => "two"
+      case _ => "other"
+    }
+  selections:
+    - anchor: {line: 1, character: 13}
+      active: {line: 1, character: 17}
+  marks: {}
+finalState:
+  documentContents: |
+    def matchTest(x: Int): String = x match {
+      case 1 => "one"
+      case 2 => "two"
+      case _ => "other"
+    }
+  selections:
+    - anchor: {line: 1, character: 2}
+      active: {line: 1, character: 2}
+  thatMark:
+    - anchor: {line: 1, character: 2}
+      active: {line: 1, character: 2}
+fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]