Add @Branch and @branch.iteration

Author: wenkokke

packages/common/src/scopeSupportFacets/haskell.ts

@@ -50,6 +50,8 @@ export const haskellScopeSupport: LanguageScopeSupportFacetMap = {
   "string.singleLine": unsupported,
   "string.multiLine": notApplicable,
 
+  "branch.match": supported,
+  "branch.match.iteration": supported,
   "branch.if": unsupported,
   "branch.if.iteration": unsupported,
   "branch.try": notApplicable,

packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts

@@ -160,11 +160,20 @@ export const scopeSupportFacetInfos: Record<
     scopeType: "string",
   },
 
+  "branch.match": {
+    description: "A pattern match branch",
+    scopeType: "branch",
+  },
+  "branch.match.iteration": {
+    description:
+      "Iteration scope for pattern match branches; should be the entire branch",
+    scopeType: "branch",
+    isIteration: true,
+  },
   "branch.if": {
     description: "An if/elif/else branch",
     scopeType: "branch",
   },
-
   "branch.if.iteration": {
     description:
       "Iteration scope for if/elif/else branch; should be the entire if-else statement",

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

@@ -43,6 +43,8 @@ const scopeSupportFacets = [
   "string.singleLine",
   "string.multiLine",
 
+  "branch.match",
+  "branch.match.iteration",
   "branch.if",
   "branch.if.iteration",
   "branch.try",

packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/haskell/branch.match.iteration1.scope

@@ -0,0 +1,15 @@
+fib 0 = 0
+fib 1 = 1
+fib n = fib (n-1) + fib (n-2)
+
+---
+
+[Range] =
+[Domain] = 0:0-2:29
+0| fib 0 = 0
+  >---------
+1| fib 1 = 1
+   ---------
+2| fib n = fib (n-1) + fib (n-2)
+   -----------------------------<
+3|

packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/haskell/branch.match.iteration10.scope

@@ -0,0 +1,42 @@
+fib 0 = 0
+fib 1 = 1
+fib n = fib (n-1) + fib (n-2)
+
+map f [] = []
+map f (x:xs) = f x : map f xs
+
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-2:29
+0| fib 0 = 0
+  >---------
+1| fib 1 = 1
+   ---------
+2| fib n = fib (n-1) + fib (n-2)
+   -----------------------------<
+3|
+
+4| map f [] = []
+
+5| map f (x:xs) = f x : map f xs
+
+6|
+
+
+
+[#2 Range] =
+[#2 Domain] = 4:0-5:29
+0| fib 0 = 0
+
+1| fib 1 = 1
+
+2| fib n = fib (n-1) + fib (n-2)
+
+3|
+
+4| map f [] = []
+  >-------------
+5| map f (x:xs) = f x : map f xs
+   -----------------------------<
+6|

packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/haskell/branch.match.iteration100.scope

@@ -0,0 +1,81 @@
+fib 0 = 0
+fib 1 = 1
+fib n = fib (n-1) + fib (n-2)
+
+map f [] = []
+map f (x:xs) = f x : map f xs
+
+not True = False
+not False = True
+
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-2:29
+0| fib 0 = 0
+  >---------
+1| fib 1 = 1
+   ---------
+2| fib n = fib (n-1) + fib (n-2)
+   -----------------------------<
+3|
+
+4| map f [] = []
+
+5| map f (x:xs) = f x : map f xs
+
+6|
+
+7| not True = False
+
+8| not False = True
+
+9|
+
+
+
+[#2 Range] =
+[#2 Domain] = 4:0-5:29
+0| fib 0 = 0
+
+1| fib 1 = 1
+
+2| fib n = fib (n-1) + fib (n-2)
+
+3|
+
+4| map f [] = []
+  >-------------
+5| map f (x:xs) = f x : map f xs
+   -----------------------------<
+6|
+
+7| not True = False
+
+8| not False = True
+
+9|
+
+
+
+[#3 Range] =
+[#3 Domain] = 7:0-8:16
+0| fib 0 = 0
+
+1| fib 1 = 1
+
+2| fib n = fib (n-1) + fib (n-2)
+
+3|
+
+4| map f [] = []
+
+5| map f (x:xs) = f x : map f xs
+
+6|
+
+7| not True = False
+  >----------------
+8| not False = True
+   ----------------<
+9|

packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/haskell/branch.match.iteration101.scope

@@ -0,0 +1,81 @@
+fib 0 = 0
+fib 1 = 1
+fib n = fib (n-1) + fib (n-2)
+
+map f [] = []
+map f (x:xs) = f x : map f xs
+
+not True = False
+not False = True
+
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-2:29
+0| fib 0 = 0
+  >---------
+1| fib 1 = 1
+   ---------
+2| fib n = fib (n-1) + fib (n-2)
+   -----------------------------<
+3|
+
+4| map f [] = []
+
+5| map f (x:xs) = f x : map f xs
+
+6|
+
+7| not True = False
+
+8| not False = True
+
+9|
+
+
+
+[#2 Range] =
+[#2 Domain] = 4:0-5:29
+0| fib 0 = 0
+
+1| fib 1 = 1
+
+2| fib n = fib (n-1) + fib (n-2)
+
+3|
+
+4| map f [] = []
+  >-------------
+5| map f (x:xs) = f x : map f xs
+   -----------------------------<
+6|
+
+7| not True = False
+
+8| not False = True
+
+9|
+
+
+
+[#3 Range] =
+[#3 Domain] = 7:0-8:16
+0| fib 0 = 0
+
+1| fib 1 = 1
+
+2| fib n = fib (n-1) + fib (n-2)
+
+3|
+
+4| map f [] = []
+
+5| map f (x:xs) = f x : map f xs
+
+6|
+
+7| not True = False
+  >----------------
+8| not False = True
+   ----------------<
+9|

packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/haskell/branch.match.iteration102.scope

@@ -0,0 +1,52 @@
+fib 0 = 0
+fib 1 = 1
+fib n = fib (n-1) + fib (n-2)
+
+map f [] = []
+map f (x:xs) = f x : map f xs
+
+type Point = (Double, Double)
+
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-2:29
+0| fib 0 = 0
+  >---------
+1| fib 1 = 1
+   ---------
+2| fib n = fib (n-1) + fib (n-2)
+   -----------------------------<
+3|
+
+4| map f [] = []
+
+5| map f (x:xs) = f x : map f xs
+
+6|
+
+7| type Point = (Double, Double)
+
+8|
+
+
+
+[#2 Range] =
+[#2 Domain] = 4:0-5:29
+0| fib 0 = 0
+
+1| fib 1 = 1
+
+2| fib n = fib (n-1) + fib (n-2)
+
+3|
+
+4| map f [] = []
+  >-------------
+5| map f (x:xs) = f x : map f xs
+   -----------------------------<
+6|
+
+7| type Point = (Double, Double)
+
+8|

packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/haskell/branch.match.iteration103.scope

@@ -0,0 +1,42 @@
+fib 0 = 0
+fib 1 = 1
+fib n = fib (n-1) + fib (n-2)
+
+map f [] = []
+map f (x:xs) = f x : map f xs
+
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-2:29
+0| fib 0 = 0
+  >---------
+1| fib 1 = 1
+   ---------
+2| fib n = fib (n-1) + fib (n-2)
+   -----------------------------<
+3|
+
+4| map f [] = []
+
+5| map f (x:xs) = f x : map f xs
+
+6|
+
+
+
+[#2 Range] =
+[#2 Domain] = 4:0-5:29
+0| fib 0 = 0
+
+1| fib 1 = 1
+
+2| fib n = fib (n-1) + fib (n-2)
+
+3|
+
+4| map f [] = []
+  >-------------
+5| map f (x:xs) = f x : map f xs
+   -----------------------------<
+6|