@willbooster/tree-sitter-haskell 3.0.0 → 4.1.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 4.0.2 or later in the 4.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 6.0.0 or later in the 6.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.
@@ -22,6 +22,7 @@ readme that the comments in `grammar.js` refer to.
 
 The fork's main differences from upstream 0.23.1 are:
 
+- **Whitespace**: horizontal tabs separate tokens, are accepted before Haddock markers, and advance layout to the next eight-column tab stop.
 - **MultilineStrings**: triple-quoted literals retain their complete source as a single `string` node, including embedded quotes, escapes, and string gaps.
 - **Comment scanning**: empty block comments such as `{--}` terminate at their closing delimiter and preserve following code.
   An ordinary line comment does not absorb a following marked Haddock comment.
@@ -42,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 4.0.2 or later in the 4.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 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:
 
 ```js
 import { fileURLToPath } from 'node:url';
@@ -82,14 +83,20 @@ parser.setLanguage(await Language.load(haskell));
 
 The package also ships `grammar.js` with the files in `grammar/` it loads, the queries in `queries/`, and the node types in `src/node-types.json`.
 
+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.
+
+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.
+
 In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-haskell) and on
 [willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter), the runtime this package is tested and
 fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "4.0.2" }
-tree-sitter-haskell = { package = "willbooster-tree-sitter-haskell", version = "3" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "6.0.0" }
+tree-sitter-haskell = { package = "willbooster-tree-sitter-haskell", version = "4" }
 ```
 
 ```rust
@@ -129,7 +136,7 @@ and the release build regenerate the parsers before compiling them.
   edits each corpus case at random, reparses it, undoes the edits, and reparses again. `TREE_SITTER_SEED`,
   `TREE_SITTER_ITERATIONS`, and `TREE_SITTER_EDITS` run other or more edits;
 - a check that the real-world Haskell files in `examples/`, the checked-in ones and those of the cloned repositories, fail to
-  parse exactly as listed in `script/known-failures.txt`; upstream's prebuilt parser fails on the same files. The first run clones the repositories. The example repositories are pinned to commits in
+  parse exactly as listed in `script/known-failures.txt`. The first run clones the repositories. The example repositories are pinned to commits in
   `script/parse-examples`. After a grammar change or a moved pin alters that list, `script/parse-examples` rewrites it;
   review its diff before committing;
 - a performance check (`test/unit/performance.test.ts`) that recovering from an error on each line takes linear

package/grammar/literal.js

@@ -26,8 +26,8 @@ module.exports = {
 
   char: _ => magic_hash(
     choice(
-      /'[^']'/,
-      /'\\[^ ]*'/,
+      /'[^'\r\n\f]'/,
+      seq("'\\", choice("'", /[^'\p{White_Space}]+/), "'"),
     ),
   ),
 

package/grammar.js

@@ -51,11 +51,9 @@ module.exports = grammar({
   ...inline,
   ...conflicts,
 
-  /**
-   * These rules may occur anywhere in the grammar and don't have to be specified in productions.
-   */
   extras: $ => [
     /\p{Zs}/,
+    /\t/,
     /\n/,
     /\r/,
     $.cpp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-haskell",
-  "version": "3.0.0",
+  "version": "4.1.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": "4.0.2",
+    "@willbooster/web-tree-sitter": "6.0.0",
     "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": "^4.0.2"
+    "@willbooster/web-tree-sitter": "^6.0.0"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/queries/tags.scm

@@ -0,0 +1,140 @@
+(header module: (module) @name) @definition.module
+
+(declarations
+  [
+    (function name: [(variable) @name (prefix_id (operator) @name)])
+    (function (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)
+
+[
+  (class_declarations
+    [
+      (function name: [(variable) @name (prefix_id (operator) @name)])
+      (function (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)])
+    ] @definition.method)
+  (instance_declarations
+    [
+      (function name: [(variable) @name (prefix_id (operator) @name)])
+      (function (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)])
+    ] @definition.method)
+]
+
+[
+  (type_synonym name: [
+    (name) @name
+    (qualified id: (name) @name)
+    (prefix_id [(operator) @name (constructor_operator) @name])
+    (prefix_id (qualified id: [(operator) @name (constructor_operator) @name]))
+  ])
+  (type_family name: [
+    (name) @name
+    (qualified id: (name) @name)
+    (prefix_id [(operator) @name (constructor_operator) @name])
+    (prefix_id (qualified id: [(operator) @name (constructor_operator) @name]))
+  ])
+  (data_family name: [
+    (name) @name
+    (qualified id: (name) @name)
+    (prefix_id [(operator) @name (constructor_operator) @name])
+    (prefix_id (qualified id: [(operator) @name (constructor_operator) @name]))
+  ])
+] @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)]))
+] @definition.class
+
+(declarations
+  [
+    (data_type name: [
+    (name) @name
+    (qualified id: (name) @name)
+    (prefix_id [(operator) @name (constructor_operator) @name])
+    (prefix_id (qualified id: [(operator) @name (constructor_operator) @name]))
+  ])
+    (newtype name: [
+    (name) @name
+    (qualified id: (name) @name)
+    (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)]))
+  ] @definition.class)
+
+(class name: [
+    (name) @name
+    (qualified id: (name) @name)
+    (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
+(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: [
+  (constructor_operator) @name
+  (operator) @name
+  (infix_id (name) @name)
+  (qualified id: [(constructor_operator) @name (operator) @name])
+  (infix_id (qualified id: (name) @name))
+])) @reference.implementation
+
+(deriving_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
+(deriving_instance (infix operator: [
+  (constructor_operator) @name
+  (operator) @name
+  (infix_id (name) @name)
+  (qualified id: [(constructor_operator) @name (operator) @name])
+  (infix_id (qualified id: (name) @name))
+])) @reference.implementation
+
+(foreign_import
+  signature: (signature name: [(variable) @name (prefix_id (operator) @name)])) @definition.function
+
+(expression/apply
+  function: [
+    (variable) @name
+    (qualified id: (variable) @name)
+    (prefix_id (operator) @name)
+    (prefix_id (qualified id: (operator) @name))
+    (parens expression: [
+      (variable) @name
+      (qualified id: (variable) @name)
+      (prefix_id (operator) @name)
+      (prefix_id (qualified id: (operator) @name))
+    ])
+  ]) @reference.call
+
+(expression/infix
+  operator: [
+    (operator) @name
+    (infix_id (variable) @name)
+    (infix_id (qualified id: (variable) @name))
+    (qualified id: (operator) @name)
+  ]) @reference.call

package/src/node-types.json

@@ -827,6 +827,16 @@
     "type": "annotated",
     "named": true,
     "fields": {
+      "bind": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "variable",
+            "named": true
+          }
+        ]
+      },
       "kind": {
         "multiple": false,
         "required": true,
@@ -840,10 +850,18 @@
     },
     "children": {
       "multiple": false,
-      "required": true,
+      "required": false,
       "types": [
         {
-          "type": "type_param",
+          "type": "invisible",
+          "named": true
+        },
+        {
+          "type": "parens",
+          "named": true
+        },
+        {
+          "type": "wildcard",
           "named": true
         }
       ]
@@ -3341,17 +3359,36 @@
   {
     "type": "inferred",
     "named": true,
-    "fields": {},
+    "fields": {
+      "bind": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "variable",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": false,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "annotated",
           "named": true
         },
         {
-          "type": "type_param",
+          "type": "invisible",
+          "named": true
+        },
+        {
+          "type": "parens",
+          "named": true
+        },
+        {
+          "type": "wildcard",
           "named": true
         }
       ]
@@ -3361,6 +3398,16 @@
     "type": "infix",
     "named": true,
     "fields": {
+      "bind": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "variable",
+            "named": true
+          }
+        ]
+      },
       "left_operand": {
         "multiple": false,
         "required": true,
@@ -4330,6 +4377,16 @@
     "type": "parens",
     "named": true,
     "fields": {
+      "bind": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "variable",
+            "named": true
+          }
+        ]
+      },
       "expression": {
         "multiple": false,
         "required": false,
@@ -4444,7 +4501,15 @@
           "named": true
         },
         {
-          "type": "type_param",
+          "type": "invisible",
+          "named": true
+        },
+        {
+          "type": "parens",
+          "named": true
+        },
+        {
+          "type": "wildcard",
           "named": true
         }
       ]
@@ -4793,17 +4858,36 @@
   {
     "type": "quantified_variables",
     "named": true,
-    "fields": {},
+    "fields": {
+      "bind": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "variable",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "inferred",
           "named": true
         },
         {
-          "type": "type_param",
+          "type": "invisible",
+          "named": true
+        },
+        {
+          "type": "parens",
+          "named": true
+        },
+        {
+          "type": "wildcard",
           "named": true
         }
       ]
@@ -4998,7 +5082,7 @@
     "named": true,
     "fields": {
       "arrow": {
-        "multiple": true,
+        "multiple": false,
         "required": false,
         "types": [
           {
@@ -5723,13 +5807,32 @@
   {
     "type": "type_params",
     "named": true,
-    "fields": {},
+    "fields": {
+      "bind": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "variable",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
       "types": [
         {
-          "type": "type_param",
+          "type": "invisible",
+          "named": true
+        },
+        {
+          "type": "parens",
+          "named": true
+        },
+        {
+          "type": "wildcard",
           "named": true
         }
       ]

package/tree-sitter.json

@@ -11,11 +11,12 @@
         "hs-boot"
       ],
       "highlights": "queries/highlights.scm",
+      "tags": "queries/tags.scm",
       "injection-regex": "^(hs|haskell)$"
     }
   ],
   "metadata": {
-    "version": "3.0.0",
+    "version": "4.1.0",
     "license": "MIT",
     "description": "Haskell grammar for tree-sitter",
     "authors": [