@willbooster/tree-sitter-javascript 1.0.1 → 1.0.3

package/grammar.js

@@ -23,6 +23,12 @@ module.exports = grammar({
     $.escape_sequence,
     $.regex_pattern,
     $.jsx_text,
+    // Zero-width tokens after an arrow function's block body that a line break (or `}` or the end of input) follows:
+    // such a function cannot be called, indexed, or used as an operand, so the statement ends there if it can. The
+    // scanner inserts the automatic semicolon right after _arrow_function_block_end, or else emits
+    // _arrow_function_block_continuation, since the arrow function may be, e.g., an argument.
+    $._arrow_function_block_end,
+    $._arrow_function_block_continuation,
   ],
 
   extras: ($) => [$.comment, $.html_comment, /[\s\p{Zs}\uFEFF\u2028\u2029\u2060\u200B]/u],
@@ -697,7 +703,13 @@ module.exports = grammar({
           $._call_signature
         ),
         '=>',
-        field('body', choice($.expression, $.statement_block))
+        choice(
+          field('body', $.expression),
+          seq(
+            field('body', $.statement_block),
+            optional(seq($._arrow_function_block_end, optional($._arrow_function_block_continuation)))
+          )
+        )
       ),
 
     // Override
@@ -912,10 +924,22 @@ module.exports = grammar({
     template_string: ($) =>
       seq(
         '`',
-        repeat(choice(alias($._template_chars, $.string_fragment), $.escape_sequence, $.template_substitution)),
+        repeat(
+          choice(
+            alias($._template_chars, $.string_fragment),
+            $.escape_sequence,
+            alias($._invalid_template_escape, $.escape_sequence),
+            $.template_substitution
+          )
+        ),
         '`'
       ),
 
+    // Tagged templates allow `\x` and `\u` without the hex digits an escape_sequence needs (the cooked string is
+    // undefined). The lexer prefers the longer escape_sequence when the digits follow. Untagged templates reject these
+    // escapes, but the lexer cannot tell the two apart.
+    _invalid_template_escape: () => token.immediate(seq('\\', /[xu]/)),
+
     template_substitution: ($) => seq('${', $._expressions, '}'),
 
     regex: ($) =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-javascript",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "JavaScript grammar for tree-sitter",
   "keywords": [
     "incremental",

package/tree-sitter.json

@@ -16,7 +16,7 @@
     }
   ],
   "metadata": {
-    "version": "1.0.1",
+    "version": "1.0.3",
     "license": "MIT",
     "description": "JavaScript grammar for tree-sitter",
     "authors": [