Merge pull request #229 from Shraymonks/update-js

Update tree-sitter-javascript

Author: mjambon

common/corpus/declarations.txt

@@ -755,6 +755,42 @@ class Foo<Bar> extends Baz { bar = 5; static one(a) { return a; }; two(b) { retu
         (formal_parameters (required_parameter (identifier)))
         (statement_block (return_statement (identifier)))))))
 
+=======================================
+Classes with static blocks
+=======================================
+
+class Foo {
+  static {
+    this.#bar = '';
+  }
+  static {
+    this.baz();
+  }
+}
+
+---
+
+(program
+  (class_declaration
+    (type_identifier)
+    (class_body
+      (class_static_block
+        (statement_block
+          (expression_statement
+            (assignment_expression
+              (member_expression
+                (this)
+                (private_property_identifier))
+              (string)))))
+      (class_static_block
+        (statement_block
+          (expression_statement
+            (call_expression
+              (member_expression
+                (this)
+                (property_identifier))
+              (arguments))))))))
+
 =======================================
 Global namespace declarations
 =======================================

common/define-grammar.js

@@ -257,7 +257,12 @@ module.exports = function defineGrammar(dialect) {
         '>'
       )),
 
-      _import_export_specifier: ($, previous) => seq(
+      export_specifier: ($, previous) => seq(
+        optional(choice('type', 'typeof')),
+        previous
+      ),
+
+      import_specifier: ($, previous) => seq(
         optional(choice('type', 'typeof')),
         previous
       ),
@@ -360,6 +365,7 @@ module.exports = function defineGrammar(dialect) {
           // The same rule applies for functions and that's why we use
           // "_function_signature_automatic_semicolon".
           seq($.method_signature, choice($._function_signature_automatic_semicolon, ',')),
+          $.class_static_block,
           seq(
             choice(
               $.abstract_method_signature,

package.json

@@ -19,7 +19,7 @@
   "main": "./bindings/node",
   "devDependencies": {
     "tree-sitter-cli": "^0.20.6",
-    "tree-sitter-javascript": "github:tree-sitter/tree-sitter-javascript#936d976"
+    "tree-sitter-javascript": "github:tree-sitter/tree-sitter-javascript#7a29d06"
   },
   "scripts": {
     "build": "npm run build-typescript && npm run build-tsx",