@willbooster/tree-sitter-haskell 2.0.1 → 3.0.0

package/README.md

@@ -13,8 +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 2.0.0
-or later; 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 4.0.2 or later in the 4.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.
@@ -23,6 +22,7 @@ readme that the comments in `grammar.js` refer to.
 
 The fork's main differences from upstream 0.23.1 are:
 
+- **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.
   Unmarked continuation lines remain in their preceding Haddock block, including space or tab indentation and LF or CRLF newlines.
@@ -42,7 +42,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 2.0.0 or later, 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 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:
 
 ```js
 import { fileURLToPath } from 'node:url';
@@ -88,8 +88,8 @@ fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "2.0.0" }
-tree-sitter-haskell = { package = "willbooster-tree-sitter-haskell", version = "1" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "4.0.2" }
+tree-sitter-haskell = { package = "willbooster-tree-sitter-haskell", version = "3" }
 ```
 
 ```rust
@@ -127,8 +127,7 @@ and the release build regenerate the parsers before compiling them.
 - the corpus in `test/corpus`, with the native build and with the Wasm build (the first run downloads the WASI SDK);
 - an incremental-parsing check (`test/unit/incremental.test.ts`): `script/fuzz-corpus` runs `tree-sitter fuzz`, which
   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. It skips the eleven cases that
-  upstream's own parser also reparses differently from a fresh parse (see `script/fuzz-corpus`);
+  `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
   `script/parse-examples`. After a grammar change or a moved pin alters that list, `script/parse-examples` rewrites it;

package/grammar/externals.js

@@ -91,6 +91,7 @@ module.exports = {
     $._phantom_where,
     $._phantom_in,
     $._phantom_arrow,
+    $._phantom_linear_arrow,
     $._phantom_bar,
     $._phantom_deriving,
 

package/grammar/id.js

@@ -68,7 +68,7 @@ module.exports = {
   _tyconids: $ => choice($._qtyconid, $._tyconid),
 
   _tycon_arrow: $ => parens($, alias($._arrow, $.operator)),
-  _qualified_arrow: $ => qualified($, alias($._arrow, $.operator)),
+  _qualified_arrow: $ => qualified($, alias(choice($._arrow, $._linear_arrow), $.operator)),
   _qtycon_arrow: $ => parens($, alias($._qualified_arrow, $.qualified)),
 
   _tycon: $ => choice($._tyconid, $._pvarsym, alias($._tycon_arrow, $.prefix_id), $._pconsym),

package/grammar/literal.js

@@ -7,14 +7,12 @@ const {
 const decimal = /[0-9][0-9_]*/
 const exponent = /[eE][+-]?[0-9_]+/
 const hex_exponent = /[pP][+-]?[0-9a-fA-F_]+/
+const escaped = /\\(\^)?./
+const string_gap = /\\\p{White_Space}+\\/
 const magic_hash = rule => token(seq(rule, optional(token.immediate(/##?/))))
 
 module.exports = {
 
-  // ------------------------------------------------------------------------
-  // literals
-  // ------------------------------------------------------------------------
-
   // the `choice` here is necessary to avoid integers being parsed as floats
   float: _ => magic_hash(
     seq(
@@ -34,14 +32,24 @@ module.exports = {
   ),
 
   string: _ => magic_hash(
-    seq(
-      '"',
-      repeat(choice(
-        /[^\\"\n]/,
-        /\\(\^)?./,
-        /\\\n\s*\\/,
-      )),
-      '"',
+    choice(
+      seq(
+        '"',
+        repeat(choice(
+          /[^\\"\n]/,
+          escaped,
+          /\\\n\s*\\/,
+        )),
+        '"',
+      ),
+      seq(
+        '"""',
+        repeat(seq(
+          optional(/""?/),
+          choice(/[^\\"]/, /\\(?:\^[@-_]|[^\p{White_Space}^])/, string_gap),
+        )),
+        '"""',
+      ),
     ),
   ),
 

package/grammar/type.js

@@ -197,7 +197,7 @@ module.exports = {
       $._fun_arrow,
     ),
     seq(
-      optional($._phantom_arrow),
+      optional($._phantom_linear_arrow),
       field('arrow', $._linear_arrow),
     ),
   ),

package/package.json

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

package/tree-sitter.json

@@ -15,7 +15,7 @@
     }
   ],
   "metadata": {
-    "version": "2.0.1",
+    "version": "3.0.0",
     "license": "MIT",
     "description": "Haskell grammar for tree-sitter",
     "authors": [