Group queries a little bit more closely by relation

Author: wenkokke

data/playground/haskell/branch.hs

@@ -1,3 +1,15 @@
+data a :*: b = a :*: b
+type a :+: b = Either a b
+
+fst :: a :*: b -> a
+fst (a :*: b) = a
+
+pair a b = a :*: b
+
+fromLeft :: a :+: b -> a
+fromLeft (Left a) = a
+fromLeft _ = undefined
+
 fib :: Integer -> Integer
 fib 0 = 0
 fib 1 = 1

packages/common/src/scopeSupportFacets/haskell.ts

@@ -8,14 +8,6 @@ import {
 const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel;
 
 export const haskellScopeSupport: LanguageScopeSupportFacetMap = {
-  command: notApplicable,
-
-  element: notApplicable,
-  tags: notApplicable,
-  startTag: notApplicable,
-  endTag: notApplicable,
-  attribute: notApplicable,
-
   list: unsupported,
   map: unsupported,
   ifStatement: unsupported,

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

@@ -0,0 +1,6 @@
+abs :: Int -> Int
+abs x
+    | x >= 0    =  x
+    | otherwise = -x
+
+---

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

@@ -0,0 +1,6 @@
+bap :: Int -> Int
+bap x
+    | x > 0, x == 0 =  x
+    | otherwise = -x
+
+---

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

@@ -0,0 +1,7 @@
+compare :: Int -> Int -> Ordering
+compare x y
+    | x <  y = LT
+    | x == y = EQ
+    | x  > y = GT
+
+---

queries/haskell.md

@@ -14,10 +14,8 @@ Adds support for the Haskell programming language.
 - [ ] `branch`
   - [x] `branch.match`
   - [x] `branch.match.iteration`
-  - [ ] `branch.if`
-  - [ ] `branch.if.iteration`
-  - [ ] `branch.guard`
-  - [ ] `branch.guard.iteration`
+  - [x] `branch.if`
+  - [x] `branch.if.iteration`
   - [ ] `branch.ternary`
 - [ ] `collectionItem`
 - [ ] `collectionKey`

queries/haskell.scm

@@ -1,29 +1,13 @@
-;; import haskell/haskell.argumentOrParameter.scm
-;; import haskell/haskell.argumentOrParameter.iteration.scm
 ;; import haskell/haskell.branch.scm
-;; import haskell/haskell.branch.iteration.scm
-;; import haskell/haskell.functionName.scm
-;; import haskell/haskell.name.function.scm
-;; import haskell/haskell.namedFunction.scm
+;; import haskell/haskell.functionApplication.scm
+;; import haskell/haskell.functionDeclaration.scm
 
 ;; Short declarations are below.
 
 ;; anonymousFunction
 (exp_lambda) @anonymousFunction
 (exp_lambda_case) @anonymousFunction
 
-;; functionCall
-(exp_apply) @functionCall
-(exp_type_application)  @functionCall
-(pat_apply) @functionCall
-(type_apply) @functionCall
-
-;; functionCallee
-(exp_apply . (_) @functionCallee)
-(exp_type_application . (_) @functionCallee)
-(pat_apply . (_) @functionCallee
-(type_apply . (_) @functionCallee)
-
 ;; list
 (exp_list) @list
 (exp_list_comprehension) @list

queries/haskell/haskell.argumentOrParameter.iteration.scm

@@ -1,6 +1,3 @@
-;; branch: function
-(function) @branch
-
 ;; branch: guard_equation
 (guard_equation
   [