@willbooster/tree-sitter-haskell 4.1.2 → 6.0.0

package/README.md

@@ -13,7 +13,7 @@ Haskell grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), f
 to its authors and contributors. This is not an official release of that project.
 
 This fork is based on upstream's version 0.23.1 grammar and generates the parser with the
-[WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator. The parser carries that fork's own ABI number, so it loads only with that fork's runtime, version 6.0.0 or later in the 6.x series; upstream's runtime rejects it.
+[WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator. The parser carries that fork's own ABI number, so it loads only with that fork's runtime, version 7.0.5 or later in the 7.x series; upstream's runtime rejects it.
 [Upstream's README at that version](https://github.com/tree-sitter/tree-sitter-haskell/blob/v0.23.1/README.md) lists
 the supported language extensions and, under "Querying", explains how to query the grammar's supertypes; it is the
 readme that the comments in `grammar.js` refer to.
@@ -43,7 +43,7 @@ reports an error: the lexers of the WillBooster/tree-sitter generator let charac
 ## Usage
 
 The npm package ships `tree-sitter-haskell.wasm` for
-[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 6.0.0 or later in the 6.x series, which runs in Node.js, Bun, browsers, and Cloudflare Workers. In Node.js and Bun, load the grammar from its path:
+[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 7.0.5 or later in the 7.x series, which runs in Node.js, Bun, browsers, and Cloudflare Workers. In Node.js and Bun, load the grammar from its path:
 
 ```js
 import { fileURLToPath } from 'node:url';
@@ -85,7 +85,9 @@ The package also ships `grammar.js` with the files in `grammar/` it loads, the q
 
 For code navigation, use `queries/tags.scm` (or `TAGS_QUERY` in Rust). It indexes module headers, top-level named functions and simple named bindings, named types and classes, class and instance methods, and syntactic variable/operator calls. A signature and each equation have separate definition locations. Call references identify the called name without resolving its binding.
 
-Extra parentheses around a function or type declaration's head are not indexed; parenthesized operator identifiers such as `(:+:)` are supported. Call-name matching supports one extra expression-parenthesis wrapper; deeper wrappers are not indexed. Destructuring bindings, local pattern bindings and constructors (including pattern synonyms) are not indexed.
+Declaration names and variable/operator callees remain indexed through nested parentheses. Class and instance equations retain their method roles; grouping a value without applying it does not create a call reference. Destructuring bindings, local pattern bindings and constructors (including pattern synonyms) are not indexed.
+
+Function and type declaration-head parentheses are anonymous syntax: the enclosing declaration directly exposes its `name`, parameter groups and infix `head` fields. Parentheses inside parameters and types retain their existing nodes. A grouped variable name, including a qualified name, uses one `parenthesized_name` node with a direct name child, independent of grouping depth. A symbolic variable operator keeps its required prefix parentheses in `prefix_id`: `(<+>)` and `(Demo.<+>)` remain `prefix_id`, while redundant grouping such as `((<+>))` adds one `parenthesized_name` wrapper around that node. This also applies to unapplied names; only function position creates a call reference or call highlight. A parenthesized simple binding name uses `parenthesized_name` in the `bind` node's `name` field, retaining one wrapper at any grouping depth. Complex expressions retain ordinary `parens` nodes. These changes affect public syntax trees.
 
 In a repository checkout, configure the CLI parser directories to include the grammar, then run `script/tree-sitter tags file.hs` to inspect the tags.
 
@@ -95,8 +97,8 @@ fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "6.0.0" }
-tree-sitter-haskell = { package = "willbooster-tree-sitter-haskell", version = "4" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "7.0.5" }
+tree-sitter-haskell = { package = "willbooster-tree-sitter-haskell", version = "6" }
 ```
 
 ```rust

package/grammar/conflicts.js

@@ -1,116 +1,22 @@
 module.exports = {
 
   conflicts: $ => [
-
-    /**
-     * For reference in GHC:
-     * - Note [Ambiguous syntactic categories]
-     * - Note [PatBuilder]
-     * - Note [Declaration/signature overlap]
-     * - These correspond to `DisambECP`
-     *
-     * (fun x) y = undefined
-     * (fun x -> y) = undefined
-     * (fun) <> x = undefined
-     *
-     * The first one is a regular function with some redundant parens, where `fun` is the declared name.
-     * The second one is a pattern binder with a view pattern, where `fun` is a free variable.
-     * The third one is an infix pattern binder, where `fun` is a simple varid pattern with redundant parens.
-     *
-     * These conflicts are also relevant for top-level expression splices, which fundamentally conflict with decls, and
-     * since decls start with either `var` or `pat`, they cannot be disambiguated.
-     *
-     * GHC parses functions and binds as expressions and sorts them into the right LHS in a post-processing step.
-     * Since this is not possible in tree-sitter, these conflicts are more function-centric than in GHC.
-     *
-     * function:
-     * func (A a) = a
-     *
-     * bind variable:
-     * a : as = [1, 2, 3]
-     *
-     * pattern bind infix:
-     * a : as = [1, 2, 3]
-     *
-     * pattern bind prefix:
-     * Just 1 = Just 1
-     *
-     * splice:
-     * makeLenses ''A
-     *
-     * Signature and bind:
-     *
-     * fun :: Int
-     * fun :: Int = 5
-     */
-
-    // Function vs bind
+    // GHC DisambECP (notes Ambiguous syntactic categories, PatBuilder and Declaration/signature overlap)
+    // disambiguates expressions, patterns and declaration heads after parsing; these alternatives must remain
+    // available until following syntax determines their role, including for top-level expression splices.
     [$._function_name, $.pattern],
-
-    // Function vs bind vs splice
     [$._function_name, $.pattern, $.expression],
-
-    // Bind vs splice
+    [$._grouped_name, $._function_name, $.pattern, $.expression],
+    [$._grouped_name, $.expression],
+    [$._grouped_name, $.pattern, $.expression],
+    [$._grouped_name, $.expression, $.pattern, $._function_name, $._binding_name_parens],
+    [$.pattern, $._function_name, $._binding_name_parens],
+    [$.pattern, $._binding_name_parens],
+    [$._grouped_name, $.expression, $.pattern, $._binding_name_parens],
     [$.pattern, $.expression],
-
-    // Signature vs bind
     [$.signature, $.pattern],
-
-    /**
-     * Unboxed syntax
-     *
-     * The hash in the opening parenthesis of unboxed tuples can be an operator.
-     */
+    // The hash opening an unboxed tuple can also begin a symbolic operator.
     [$._operator_hash_head, $._unboxed_open],
-
-    /**
-     * Types conflicting with structures that look like types
-     *
-     * Note: These conflicts have been circumvented by a lookahead mechanism in the scanner.
-     * This comment is preserved for reference.
-     *
-     * `name` and `constructor` use the same terminal symbol, but we cannot reduce `constructor` in prefix data
-     * constructor declarations.
-     *
-     * In GHC, this corresponds to `DisambTD`.
-     *
-     * > data A = Name Int
-     * > data A = Maybe Int :+ Int
-     * > data A = Monoid a => A a
-     *
-     * All of these start with a `name` node.
-     * In the first example, the `name` is a data constructor, which will not be reduced to a `type`.
-     *
-     * In the second example, the `name` is a type constructor applied to another type in the left operand of an infix
-     * data constructor, so it must be reduced to `type`, and then to `apply` with the `Int`.
-     *
-     * In the third example, the `name` is a type constructor applied to a variable resulting in a constraint.
-     * It will be reduced the same way as the second example, but using the class tree, which is mostly identical to the
-     * type tree, but conflicts since we want to distinguish classes from types granularly.
-     *
-     * In GHC, these correspond to `mkHsAppTyHeadPV` and `mkHsAppTyPV`.
-     *
-     * > data A a b = a `C` b => a `A` b
-     * > data A a b = a `A` b
-     *
-     * > data a *** b
-     * > data a +++ b => a *** b
-     *
-     * In GHC, this corresponds to `mkHsOpTyPV`.
-     *
-     * > class A where type a + b = r | r -> a b
-     * > class A where type a + b = (a, b)
-     *
-     * The first one is a type family declaration, the second one an instance.
-     *
-     * These were the conflicts that have been turned into scanner lookahead:
-     *
-     * [$._type_con, $.data_constructor],
-     * [$._type_con, $._type_head_name],
-     * [$._type_variable, $._tyvar],
-     * [$._constructor_ticked, $._tycon_ticked],
-     */
-
   ],
 
 }

package/grammar/decl.js

@@ -68,7 +68,7 @@ module.exports = {
 
   _function_name: $ => field('name', $._var),
 
-  function_head_parens: $ => parens(
+  _function_head_parens: $ => parens(
     $,
     choice(
       $._function_head,
@@ -78,7 +78,7 @@ module.exports = {
 
   _function_head_patterns: $ => choice(
     $._function_name,
-    field('parens', $.function_head_parens),
+    $._function_head_parens,
   ),
 
   /**
@@ -98,7 +98,7 @@ module.exports = {
 
   _function_head: $ => choice(
     seq($._function_head_patterns, field('patterns', $.patterns)),
-    alias($._function_head_infix, $.infix),
+    field('head', alias($._function_head_infix, $.infix)),
   ),
 
   function: $ => seq(
@@ -106,6 +106,8 @@ module.exports = {
     $._bind_matches,
   ),
 
+  _binding_name_parens: $ => parens($, choice($._var, $._binding_name_parens)),
+
   /**
    * The `implicit_variable` here is for:
    * g = let ?par = Impy 5 in f
@@ -114,14 +116,12 @@ module.exports = {
     choice(
       field('pattern', $._pat),
       field('name', $._var),
+      field('name', alias($._binding_name_parens, $.parenthesized_name)),
       field('implicit', $.implicit_variable),
     ),
     $._bind_matches,
   )),
 
-  /**
-   * This is a supertype.
-   */
   decl: $ => choice(
     $.signature,
     $.function,

package/grammar/exp.js

@@ -78,9 +78,6 @@ module.exports = {
 
   _exp_list: $ => brackets($, sep1(',', field('element', $._exp)), optional(',')),
 
-  /**
-    * An expression like `[1,2..20]`.
-    */
   _exp_arithmetic_sequence: $ => brackets(
     $,
     field('from', $._exp),
@@ -119,9 +116,6 @@ module.exports = {
     alias($._exp, $.boolean),
   ),
 
-  /**
-   * This is a supertype.
-   */
   qualifiers: $ => seq(sep1(',', field('qualifier', $.qualifier))),
 
   _exp_list_comprehension: $ => brackets(
@@ -171,9 +165,6 @@ module.exports = {
 
   _exp_statement: $ => $._exp,
 
-  /**
-   * This is a supertype.
-   */
   statement: $ => choice(
     alias($._exp_statement, $.exp),
     alias($.generator, $.bind),
@@ -278,9 +269,6 @@ module.exports = {
     repeat(seq($._tight_dot, field('field', $.variable))),
   ),
 
-  /**
-   * A dot-syntax field projection like `var.name.othername`.
-   */
   _exp_projection: $ => seq(
     prec('projection', seq(
       field('expression', $.expression),
@@ -295,6 +283,10 @@ module.exports = {
 
   explicit_type: $ => parens($, 'type', field('type', $.type)),
 
+  _grouped_name: $ => choice($._vars, parens($, $._grouped_name)),
+
+  parenthesized_name: $ => prec.dynamic(1, parens($, $._grouped_name)),
+
   _exp_apply: $ => prec.left('apply', seq(
     field('function', $.expression),
     field('argument', choice(
@@ -367,10 +359,8 @@ module.exports = {
   // top level
   // ------------------------------------------------------------------------
 
-  /**
-   * This is a supertype.
-   */
   expression: $ => choice(
+    $.parenthesized_name,
     alias($._exp_infix, $.infix),
     alias($._exp_negation, $.negation),
     alias($._exp_apply, $.apply),

package/grammar/precedences.js

@@ -41,25 +41,19 @@ module.exports = {
     // qualified names
     // ------------------------------------------------
 
-    /**
-     * Prioritize shifting over a tight infix dot over reducing to a qualified constructor or module.
-     */
+    // Shift a tight dot before reducing a qualified constructor or module.
     [
       'qualifying-module',
       'qualified-id',
     ],
 
-    /**
-     * Prioritize qualified variables over record field projection on constructors.
-     */
+    // Prefer a qualified variable over record-field projection on a constructor.
     [
       'qualifying-module',
       'con',
     ],
 
-    /**
-     * Prioritize qualified names over the infix operator dot in types.
-     */
+    // Prefer a qualified type name over an infix dot operator.
     [
       'qualifying-module',
       'type-name',
@@ -104,6 +98,8 @@ module.exports = {
       'apply',
     ],
 
+    [$._grouped_name, $.parenthesized_name, $._exp_parens],
+
   ],
 
 }

package/grammar/type.js

@@ -29,9 +29,6 @@ module.exports = {
 
   _type_param_invisible: $ => prefix_at($, field('bind', $.type_param)),
 
-  /**
-   * This is a supertype.
-   */
   type_param: $ => choice(
     alias($._type_param_wildcard, $.wildcard),
     alias($._type_param_invisible, $.invisible),
@@ -101,9 +98,6 @@ module.exports = {
 
   _type_apply_arg: $ => choice($.type, alias($._at_type, $.kind_application)),
 
-  /**
-   * Type application, as in `Either e (Int, Text)` or `TypeRep @Int`.
-   */
   _type_apply: $ => prec.left('apply', seq(
     field('constructor', $.type),
     field('argument', $._type_apply_arg),
@@ -123,9 +117,6 @@ module.exports = {
   // unquantified type
   // ------------------------------------------------------------------------
 
-  /**
-   * This is a supertype.
-   */
   type: $ => choice(
     $._type_name,
     alias($._type_star, $.star),
@@ -240,9 +231,6 @@ module.exports = {
   // top level
   // ------------------------------------------------------------------------
 
-  /**
-   * This is a supertype.
-   */
   quantified_type: $ => choice(
     alias($._qtype_function, $.function),
     alias($._qtype_linear_function, $.linear_function),
@@ -293,7 +281,7 @@ module.exports = {
 
   _type_head_params: $ => choice(
     $._type_head_name,
-    alias($._type_head_parens, $.parens),
+    $._type_head_parens,
   ),
 
   _type_head_infix: $ => prec('infix', seq(
@@ -302,26 +290,10 @@ module.exports = {
     field('right_operand', $.type_param),
   )),
 
-  /**
-  * A type head introduces the name and parameters in the declaration of a data type/family, type synonym/family, or
-  * class.
-  *
-  * It can be in prefix or infix form:
-  *
-  * > A a b
-  * > a +++ b
-  *
-  * Parameters can be visible or invisible, the latter marked by a prefix `@`.
-  * They can be plain or parenthesized variable names, the latter with an optional kind signature.
-  * They can be wildcards.
-  *
-  * Examples: `a`, `@a`, `(a :: Type)`, `@(_ :: Type -> Type)`
-  *
-  * The rules are slightly relaxed compared to GHC.
-  */
+  // Declaration heads permit variable binders; instance heads below permit full type patterns.
   _type_head: $ => choice(
     seq($._type_head_params, optional(field('patterns', $.type_params))),
-    alias($._type_head_infix, $.infix),
+    field('head', alias($._type_head_infix, $.infix)),
   ),
 
   // ------------------------------------------------------------------------
@@ -339,18 +311,14 @@ module.exports = {
 
   _type_instance_head_params: $ => choice(
     field('name', $._tycons),
-    alias($._type_instance_head_parens, $.parens),
+    $._type_instance_head_parens,
   ),
 
   type_patterns: $ => repeat1(prec('patterns', $._type_apply_arg)),
 
-  /**
-   * The equivalent of a type head, for type instances, which can contain full type patterns rather than just variable
-   * binders.
-   */
   _type_instance_head: $ => choice(
     seq($._type_instance_head_params, optional(field('patterns', $.type_patterns))),
-    seq($._cond_infix, alias($._type_infix, $.infix)),
+    seq($._cond_infix, field('head', alias($._type_infix, $.infix))),
   ),
 
   // ------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-haskell",
-  "version": "4.1.2",
+  "version": "6.0.0",
   "description": "Haskell grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -48,7 +48,7 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.26.1",
-    "@willbooster/web-tree-sitter": "6.0.0",
+    "@willbooster/web-tree-sitter": "7.0.5",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.2.1",
     "oxfmt": "0.72.0",
@@ -61,7 +61,7 @@
     "wrangler": "4.147.0"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^6.0.0"
+    "@willbooster/web-tree-sitter": "^7.0.5"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/queries/highlights.scm

@@ -449,3 +449,13 @@
 ; ----------------------------------------------------------------------------
 ; Spell checking
 (comment) @spell
+
+; ----------------------------------------------------------------------------
+; Calls through grouped names
+
+(expression/apply
+  function: (parenthesized_name
+    [
+      (variable) @function.call
+      (qualified id: (variable) @function.call)
+    ]))

package/queries/locals.scm

@@ -2,3 +2,5 @@
 (function name: (variable)) @local.definition
 (pattern/variable) @local.definition
 (expression/variable) @local.reference
+(expression/parenthesized_name (variable) @local.reference)
+(_ name: (parenthesized_name (variable) @local.definition))

package/queries/tags.scm

@@ -3,32 +3,44 @@
 (declarations
   [
     (function name: [(variable) @name (prefix_id (operator) @name)])
-    (function (infix operator: [(operator) @name (infix_id (variable) @name)]))
+    (function head: (infix operator: [(operator) @name (infix_id (variable) @name)]))
     (signature name: [(variable) @name (prefix_id (operator) @name)])
     (signature names: (binding_list name: [(variable) @name (prefix_id (operator) @name)]))
   ] @definition.function)
 
 (declarations
-  (bind name: [(variable) @name (prefix_id (operator) @name)]) @definition.variable)
+  (bind name: [
+    (variable) @name
+    (prefix_id (operator) @name)
+    (parenthesized_name [(variable) @name (prefix_id (operator) @name)])
+  ]) @definition.variable)
 
 [
   (class_declarations
     [
       (function name: [(variable) @name (prefix_id (operator) @name)])
-      (function (infix operator: [(operator) @name (infix_id (variable) @name)]))
+      (function head: (infix operator: [(operator) @name (infix_id (variable) @name)]))
       (signature name: [(variable) @name (prefix_id (operator) @name)])
       (signature names: (binding_list name: [(variable) @name (prefix_id (operator) @name)]))
       (default_signature signature: (signature name: [(variable) @name (prefix_id (operator) @name)]))
       (default_signature signature: (signature names: (binding_list name: [(variable) @name (prefix_id (operator) @name)])))
-      (bind name: [(variable) @name (prefix_id (operator) @name)])
+      (bind name: [
+        (variable) @name
+        (prefix_id (operator) @name)
+        (parenthesized_name [(variable) @name (prefix_id (operator) @name)])
+      ])
     ] @definition.method)
   (instance_declarations
     [
       (function name: [(variable) @name (prefix_id (operator) @name)])
-      (function (infix operator: [(operator) @name (infix_id (variable) @name)]))
+      (function head: (infix operator: [(operator) @name (infix_id (variable) @name)]))
       (signature name: [(variable) @name (prefix_id (operator) @name)])
       (signature names: (binding_list name: [(variable) @name (prefix_id (operator) @name)]))
-      (bind name: [(variable) @name (prefix_id (operator) @name)])
+      (bind name: [
+        (variable) @name
+        (prefix_id (operator) @name)
+        (parenthesized_name [(variable) @name (prefix_id (operator) @name)])
+      ])
     ] @definition.method)
 ]
 
@@ -54,9 +66,9 @@
 ] @definition.class
 
 [
-  (type_synonym (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]) "=")
-  (type_family . [(cpp) (comment) (haddock) (pragma)]* . (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]))
-  (data_family . [(cpp) (comment) (haddock) (pragma)]* . (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]))
+  (type_synonym head: (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]))
+  (type_family head: (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]))
+  (data_family head: (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]))
 ] @definition.class
 
 (declarations
@@ -73,10 +85,8 @@
     (prefix_id [(operator) @name (constructor_operator) @name])
     (prefix_id (qualified id: [(operator) @name (constructor_operator) @name]))
   ])
-    (data_type . [(cpp) (comment) (haddock) (pragma)]* . (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]))
-    (data_type . [(cpp) (comment) (haddock) (pragma)]* . (context) . [(cpp) (comment) (haddock) (pragma)]* . (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]))
-    (newtype . [(cpp) (comment) (haddock) (pragma)]* . (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]))
-    (newtype . [(cpp) (comment) (haddock) (pragma)]* . (context) . [(cpp) (comment) (haddock) (pragma)]* . (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]))
+    (data_type head: (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]))
+    (newtype head: (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)]))
   ] @definition.class)
 
 (class name: [
@@ -85,14 +95,14 @@
     (prefix_id [(operator) @name (constructor_operator) @name])
     (prefix_id (qualified id: [(operator) @name (constructor_operator) @name]))
   ]) @definition.interface
-(class (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)])) @definition.interface
+(class head: (infix operator: [(constructor_operator) @name (operator) @name (infix_id (name) @name)])) @definition.interface
 (instance name: [
     (name) @name
     (qualified id: (name) @name)
     (prefix_id [(operator) @name (constructor_operator) @name])
     (prefix_id (qualified id: [(operator) @name (constructor_operator) @name]))
   ]) @reference.implementation
-(instance (infix operator: [
+(instance head: (infix operator: [
   (constructor_operator) @name
   (operator) @name
   (infix_id (name) @name)
@@ -106,7 +116,7 @@
     (prefix_id [(operator) @name (constructor_operator) @name])
     (prefix_id (qualified id: [(operator) @name (constructor_operator) @name]))
   ]) @reference.implementation
-(deriving_instance (infix operator: [
+(deriving_instance head: (infix operator: [
   (constructor_operator) @name
   (operator) @name
   (infix_id (name) @name)
@@ -123,7 +133,7 @@
     (qualified id: (variable) @name)
     (prefix_id (operator) @name)
     (prefix_id (qualified id: (operator) @name))
-    (parens expression: [
+    (parenthesized_name [
       (variable) @name
       (qualified id: (variable) @name)
       (prefix_id (operator) @name)

package/src/node-types.json

@@ -317,6 +317,10 @@
         "type": "parens",
         "named": true
       },
+      {
+        "type": "parenthesized_name",
+        "named": true
+      },
       {
         "type": "prefix_id",
         "named": true
@@ -1105,6 +1109,10 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "parenthesized_name",
+            "named": true
+          },
           {
             "type": "prefix_id",
             "named": true
@@ -1274,6 +1282,16 @@
           }
         ]
       },
+      "head": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": false,
@@ -1297,7 +1315,7 @@
         ]
       },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -1306,20 +1324,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "infix",
-          "named": true
-        },
-        {
-          "type": "parens",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -1429,6 +1433,10 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "parenthesized_name",
+            "named": true
+          },
           {
             "type": "prefix_id",
             "named": true
@@ -1592,6 +1600,16 @@
     "type": "data_family",
     "named": true,
     "fields": {
+      "head": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
       "kind": {
         "multiple": false,
         "required": false,
@@ -1625,7 +1643,7 @@
         ]
       },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -1634,20 +1652,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "infix",
-          "named": true
-        },
-        {
-          "type": "parens",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -1721,9 +1725,19 @@
           }
         ]
       },
-      "kind": {
+      "head": {
         "multiple": false,
         "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
+      "kind": {
+        "multiple": true,
+        "required": false,
         "types": [
           {
             "type": "quantified_type",
@@ -1758,7 +1772,7 @@
         ]
       },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -1771,20 +1785,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "infix",
-          "named": true
-        },
-        {
-          "type": "parens",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -1906,6 +1906,26 @@
           }
         ]
       },
+      "head": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
+      "kind": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "quantified_type",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": false,
@@ -1925,7 +1945,7 @@
         ]
       },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -1954,20 +1974,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "infix",
-          "named": true
-        },
-        {
-          "type": "parens",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -2079,6 +2085,26 @@
           }
         ]
       },
+      "head": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
+      "kind": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "quantified_type",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": false,
@@ -2112,7 +2138,7 @@
         ]
       },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -2133,17 +2159,9 @@
       }
     },
     "children": {
-      "multiple": true,
+      "multiple": false,
       "required": false,
       "types": [
-        {
-          "type": "infix",
-          "named": true
-        },
-        {
-          "type": "parens",
-          "named": true
-        },
         {
           "type": "quantified_type",
           "named": true
@@ -2767,6 +2785,16 @@
           }
         ]
       },
+      "head": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
       "match": {
         "multiple": true,
         "required": false,
@@ -2809,18 +2837,8 @@
           }
         ]
       },
-      "parens": {
-        "multiple": false,
-        "required": false,
-        "types": [
-          {
-            "type": "function_head_parens",
-            "named": true
-          }
-        ]
-      },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -2839,66 +2857,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "infix",
-          "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "function_head_parens",
-    "named": true,
-    "fields": {
-      "name": {
-        "multiple": false,
-        "required": false,
-        "types": [
-          {
-            "type": "prefix_id",
-            "named": true
-          },
-          {
-            "type": "variable",
-            "named": true
-          }
-        ]
-      },
-      "parens": {
-        "multiple": false,
-        "required": false,
-        "types": [
-          {
-            "type": "function_head_parens",
-            "named": true
-          }
-        ]
-      },
-      "patterns": {
-        "multiple": false,
-        "required": false,
-        "types": [
-          {
-            "type": "patterns",
-            "named": true
-          }
-        ]
-      }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "infix",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -3561,6 +3519,26 @@
           }
         ]
       },
+      "head": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
+      "kind": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "quantified_type",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": false,
@@ -3580,7 +3558,7 @@
         ]
       },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -3589,20 +3567,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "infix",
-          "named": true
-        },
-        {
-          "type": "parens",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -3678,6 +3642,16 @@
     "type": "kind_signature",
     "named": true,
     "fields": {
+      "head": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
       "kind": {
         "multiple": false,
         "required": true,
@@ -3711,7 +3685,7 @@
         ]
       },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -3720,20 +3694,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "infix",
-          "named": true
-        },
-        {
-          "type": "parens",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -4268,9 +4228,19 @@
           }
         ]
       },
-      "kind": {
+      "head": {
         "multiple": false,
         "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
+      "kind": {
+        "multiple": true,
+        "required": false,
         "types": [
           {
             "type": "quantified_type",
@@ -4305,7 +4275,7 @@
         ]
       },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -4318,20 +4288,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "infix",
-          "named": true
-        },
-        {
-          "type": "parens",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -4401,42 +4357,6 @@
           }
         ]
       },
-      "kind": {
-        "multiple": false,
-        "required": false,
-        "types": [
-          {
-            "type": "quantified_type",
-            "named": true
-          }
-        ]
-      },
-      "name": {
-        "multiple": false,
-        "required": false,
-        "types": [
-          {
-            "type": "name",
-            "named": true
-          },
-          {
-            "type": "prefix_id",
-            "named": true
-          },
-          {
-            "type": "prefix_list",
-            "named": true
-          },
-          {
-            "type": "qualified",
-            "named": true
-          },
-          {
-            "type": "unit",
-            "named": true
-          }
-        ]
-      },
       "pattern": {
         "multiple": false,
         "required": false,
@@ -4455,20 +4375,6 @@
           }
         ]
       },
-      "patterns": {
-        "multiple": false,
-        "required": false,
-        "types": [
-          {
-            "type": "type_params",
-            "named": true
-          },
-          {
-            "type": "type_patterns",
-            "named": true
-          }
-        ]
-      },
       "type": {
         "multiple": false,
         "required": false,
@@ -4496,10 +4402,6 @@
           "type": "constraints",
           "named": true
         },
-        {
-          "type": "infix",
-          "named": true
-        },
         {
           "type": "invisible",
           "named": true
@@ -4515,6 +4417,29 @@
       ]
     }
   },
+  {
+    "type": "parenthesized_name",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "prefix_id",
+          "named": true
+        },
+        {
+          "type": "qualified",
+          "named": true
+        },
+        {
+          "type": "variable",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "pattern_guard",
     "named": true,
@@ -5630,6 +5555,16 @@
           }
         ]
       },
+      "head": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
       "kind": {
         "multiple": false,
         "required": false,
@@ -5663,7 +5598,7 @@
         ]
       },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -5677,14 +5612,6 @@
       "multiple": true,
       "required": false,
       "types": [
-        {
-          "type": "infix",
-          "named": true
-        },
-        {
-          "type": "parens",
-          "named": true
-        },
         {
           "type": "type_family_injectivity",
           "named": true
@@ -5756,6 +5683,26 @@
           }
         ]
       },
+      "head": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
+      "kind": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "quantified_type",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": false,
@@ -5775,7 +5722,7 @@
         ]
       },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -5786,17 +5733,9 @@
       }
     },
     "children": {
-      "multiple": true,
+      "multiple": false,
       "required": true,
       "types": [
-        {
-          "type": "infix",
-          "named": true
-        },
-        {
-          "type": "parens",
-          "named": true
-        },
         {
           "type": "quantified_type",
           "named": true
@@ -5866,6 +5805,16 @@
     "type": "type_synonym",
     "named": true,
     "fields": {
+      "head": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "infix",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": false,
@@ -5889,7 +5838,7 @@
         ]
       },
       "patterns": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -5912,20 +5861,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "infix",
-          "named": true
-        },
-        {
-          "type": "parens",
-          "named": true
-        }
-      ]
     }
   },
   {

package/tree-sitter.json

@@ -16,7 +16,7 @@
     }
   ],
   "metadata": {
-    "version": "4.1.2",
+    "version": "6.0.0",
     "license": "MIT",
     "description": "Haskell grammar for tree-sitter",
     "authors": [