@willbooster/tree-sitter-php 1.0.0 → 1.0.2

package/README.md

@@ -10,8 +10,8 @@ PHP grammars for [tree-sitter](https://github.com/tree-sitter/tree-sitter), fork
 [tree-sitter/tree-sitter-php](https://github.com/tree-sitter/tree-sitter-php). We are grateful
 to its authors and contributors. This is not an official release of that project.
 
-This fork keeps the grammars and the queries of upstream's version 0.24.2, and its scanner except for one statement
-adapted to the `tree_sitter/array.h` that the generator writes. It generates the parsers with the
+This fork keeps the grammars and the queries of upstream's version 0.24.2. Its external scanner adapts to the generated
+array API and fixes incremental heredoc parsing. It generates the parsers with the
 [WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator. The parsers carry that fork's own ABI
 number, so they load only with its runtime (`willbooster-tree-sitter`, `@willbooster/web-tree-sitter`), version 2.0.0
 or later, and that runtime loads no parser that upstream's generator wrote.

package/common/define-grammar.js

@@ -104,6 +104,7 @@ module.exports = function defineGrammar(dialect) {
       $.heredoc_start,
       $.heredoc_end,
       $.nowdoc_string,
+      $._heredoc_line_start,
       $.sentinel_error, // Unused token used to indicate error recovery mode
     ],
 
@@ -1457,9 +1458,9 @@ module.exports = function defineGrammar(dialect) {
       string_content: _ => prec.right(repeat1(token.immediate(prec(1, /\\?[^'\\]+/)))),
 
       heredoc_body: $ => seq(
-        $._new_line,
+        $._heredoc_new_line,
         repeat1(prec.right(seq(
-          optional($._new_line),
+          optional($._heredoc_new_line),
           $._interpolated_string_body_heredoc,
         ))),
       ),
@@ -1472,13 +1473,15 @@ module.exports = function defineGrammar(dialect) {
         choice(
           seq(
             field('value', $.heredoc_body),
-            $._new_line,
+            $._heredoc_new_line,
           ),
           field('value', optional($.heredoc_body)),
         ),
         field('end_tag', $.heredoc_end),
       ),
 
+      _heredoc_new_line: $ => seq($._new_line, $._heredoc_line_start),
+
       _new_line: _ => /\r?\n|\r/,
 
       nowdoc_body: $ => seq(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-php",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "PHP grammar for tree-sitter",
   "keywords": [
     "incremental",

package/tree-sitter.json

@@ -33,7 +33,7 @@
     }
   ],
   "metadata": {
-    "version": "1.0.0",
+    "version": "1.0.2",
     "license": "MIT",
     "description": "PHP grammar for tree-sitter",
     "authors": [