fix: decorator_call_expression type arguments

tree-sitter · Jun 18, 2024 · 2f181af · 2f181af
1 parent 4ad3010
commit 2f181af
Show file tree

Hide file tree

Showing 6 changed files with 482,186 additions and 481,773 deletions.
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -379,6 +379,15 @@ module.exports = function defineGrammar(dialect) {
         choice($._semicolon, $._function_signature_automatic_semicolon),
       ),
 
+      decorator_call_expression: $ => prec('call', seq(
+        field('function', choice(
+          $.identifier,
+          alias($.decorator_member_expression, $.member_expression),
+        )),
+        optional(field('type_arguments', $.type_arguments)),
+        field('arguments', $.arguments),
+      )),
+
       class_body: ($) => seq(
         '{',
         repeat(choice(

diff --git a/test/corpus/declarations.txt b/test/corpus/declarations.txt
@@ -922,6 +922,33 @@ class Foo {
         (string
           (string_fragment))))))
 
+===========================================================
+Classes with decorator calls that have type arguments
+===========================================================
+
+class Foo {
+  @bar<T>()
+  method() {
+  }
+}
+
+---
+
+(program
+  (class_declaration
+    (type_identifier)
+    (class_body
+      (decorator
+        (call_expression
+          (identifier)
+          (type_arguments
+            (type_identifier))
+          (arguments)))
+      (method_definition
+        (property_identifier)
+        (formal_parameters)
+        (statement_block)))))
+
 =======================================
 Classes with decorators
 =======================================

diff --git a/tsx/src/grammar.json b/tsx/src/grammar.json
@@ -1,15 +1,6 @@
 {
-  "0": "j",
-  "1": "a",
-  "2": "v",
-  "3": "a",
-  "4": "s",
-  "5": "c",
-  "6": "r",
-  "7": "i",
-  "8": "p",
-  "9": "t",
   "name": "tsx",
+  "inherits": "javascript",
   "word": "identifier",
   "rules": {
     "program": {
@@ -6549,6 +6540,22 @@
               ]
             }
           },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "type_arguments",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "type_arguments"
+                }
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
           {
             "type": "FIELD",
             "name": "arguments",