@willbooster/tree-sitter-haskell 8.3.1 → 9.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 7.0.5 or later in the 7.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.7 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.
@@ -24,7 +24,8 @@ 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.
+- **Comment scanning**: comments and Haddock nodes expose a named `content` child, preserving body whitespace and excluding outer delimiters. Ordinary comment injection captures this child.
+  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.
   Unmarked continuation lines remain in their preceding Haddock block, including space or tab indentation and LF or CRLF newlines.
   First-column ordinary comments combine with LF line endings.
@@ -39,7 +40,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 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:
+[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 7.0.7 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';
@@ -97,7 +98,7 @@ fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "7.0.5" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "7.0.7" }
 tree-sitter-haskell = { package = "willbooster-tree-sitter-haskell", version = "8" }
 ```
 

package/grammar/comment.js

@@ -0,0 +1,13 @@
+module.exports = {
+
+  comment: $ => choice(
+    seq('{-', $._cond_comment_block, $.content, '-}'),
+    seq(alias(/--+/, '--'), $._cond_comment_line, $.content),
+  ),
+
+  haddock: $ => choice(
+    seq('{-', $._cond_haddock_block, alias(choice('|', '^'), 'haddock_marker'), $.content, '-}'),
+    seq(alias(/--+/, '--'), $._cond_haddock_line, alias(choice('|', '^'), 'haddock_marker'), $.content),
+  ),
+
+}

package/grammar/externals.js

@@ -98,8 +98,11 @@ module.exports = {
     // Detect and emit text nodes for comments and CPP.
     // In particular, #else branches of CPP conditionals a fully contained in the resulting node, since their nonlinear
     // nature means they cannot be parsed.
-    $.comment,
-    $.haddock,
+    $._cond_comment_block,
+    $._cond_haddock_block,
+    $._cond_comment_line,
+    $._cond_haddock_line,
+    $.content,
     $.cpp,
     $.pragma,
 

package/grammar.js

@@ -1,5 +1,6 @@
 const
   class_ = require('./grammar/class.js'),
+  comment = require('./grammar/comment.js'),
   conflicts = require('./grammar/conflicts.js'),
   context = require('./grammar/context.js'),
   data = require('./grammar/data.js'),
@@ -29,6 +30,7 @@ module.exports = grammar({
     ),
 
     ...general,
+    ...comment,
     ...type,
     ...context,
     ...exp,

package/hsc/src/node-types.json

@@ -1518,6 +1518,22 @@
       }
     }
   },
+  {
+    "type": "comment",
+    "named": true,
+    "extra": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "content",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "conditional",
     "named": true,
@@ -3317,6 +3333,22 @@
       }
     }
   },
+  {
+    "type": "haddock",
+    "named": true,
+    "extra": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "content",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "haskell",
     "named": true,
@@ -6534,6 +6566,10 @@
     "type": "-",
     "named": false
   },
+  {
+    "type": "--",
+    "named": false
+  },
   {
     "type": "->",
     "named": false
@@ -6542,6 +6578,10 @@
     "type": "->.",
     "named": false
   },
+  {
+    "type": "-}",
+    "named": false
+  },
   {
     "type": ".",
     "named": false
@@ -6635,12 +6675,11 @@
     "named": false
   },
   {
-    "type": "comment",
-    "named": true,
-    "extra": true
+    "type": "constructor",
+    "named": true
   },
   {
-    "type": "constructor",
+    "type": "content",
     "named": true
   },
   {
@@ -6701,9 +6740,8 @@
     "named": false
   },
   {
-    "type": "haddock",
-    "named": true,
-    "extra": true
+    "type": "haddock_marker",
+    "named": false
   },
   {
     "type": "hiding",
@@ -6870,6 +6908,10 @@
     "type": "{",
     "named": false
   },
+  {
+    "type": "{-",
+    "named": false
+  },
   {
     "type": "|",
     "named": false

package/package.json

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

package/queries/injections.scm

@@ -4,7 +4,7 @@
   (quoter) @injection.language
   (quasiquote_body) @injection.content)
 
-((comment) @injection.content
+((comment (content) @injection.content)
   (#set! injection.language "comment"))
 
 ; -----------------------------------------------------------------------------

package/src/node-types.json

@@ -1482,6 +1482,22 @@
       }
     }
   },
+  {
+    "type": "comment",
+    "named": true,
+    "extra": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "content",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "conditional",
     "named": true,
@@ -3227,6 +3243,22 @@
       }
     }
   },
+  {
+    "type": "haddock",
+    "named": true,
+    "extra": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "content",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "haskell",
     "named": true,
@@ -6327,6 +6359,10 @@
     "type": "-",
     "named": false
   },
+  {
+    "type": "--",
+    "named": false
+  },
   {
     "type": "->",
     "named": false
@@ -6335,6 +6371,10 @@
     "type": "->.",
     "named": false
   },
+  {
+    "type": "-}",
+    "named": false
+  },
   {
     "type": ".",
     "named": false
@@ -6428,12 +6468,11 @@
     "named": false
   },
   {
-    "type": "comment",
-    "named": true,
-    "extra": true
+    "type": "constructor",
+    "named": true
   },
   {
-    "type": "constructor",
+    "type": "content",
     "named": true
   },
   {
@@ -6494,9 +6533,8 @@
     "named": false
   },
   {
-    "type": "haddock",
-    "named": true,
-    "extra": true
+    "type": "haddock_marker",
+    "named": false
   },
   {
     "type": "hiding",
@@ -6655,6 +6693,10 @@
     "type": "{",
     "named": false
   },
+  {
+    "type": "{-",
+    "named": false
+  },
   {
     "type": "|",
     "named": false

package/tree-sitter.json

@@ -35,7 +35,7 @@
     }
   ],
   "metadata": {
-    "version": "8.3.1",
+    "version": "9.0.0",
     "license": "MIT",
     "description": "Haskell grammar for tree-sitter",
     "authors": [