fix: move method decorators into method_decorator field

Author: mclaughlinconnor

common/define-grammar.js

@@ -420,7 +420,6 @@ module.exports = function defineGrammar(dialect) {
         '{',
         repeat(choice(
           seq(
-            repeat(field('decorator', $.decorator)),
             $.method_definition,
             optional($._semicolon),
           ),
@@ -449,6 +448,7 @@ module.exports = function defineGrammar(dialect) {
       ),
 
       method_definition: $ => prec.left(seq(
+        repeat(field('decorator', $.decorator)),
         optional($.accessibility_modifier),
         optional('static'),
         optional($.override_modifier),

test/corpus/declarations.txt

@@ -938,13 +938,13 @@ class Foo {
   (class_declaration
     (type_identifier)
     (class_body
-      (decorator
-        (call_expression
-          (identifier)
-          (type_arguments
-            (type_identifier))
-          (arguments)))
       (method_definition
+        (decorator
+          (call_expression
+            (identifier)
+            (type_arguments
+              (type_identifier))
+            (arguments)))
         (property_identifier)
         (formal_parameters)
         (statement_block)))))
@@ -1000,9 +1000,9 @@ Classes with decorators
           (type_identifier))
         (string
           (string_fragment)))
-      (decorator
-        (identifier))
       (method_definition
+        (decorator
+          (identifier))
         (property_identifier)
         (formal_parameters
           (required_parameter
@@ -1204,12 +1204,12 @@ class C {
   (class_declaration
     (type_identifier)
     (class_body
-      (decorator
-        (parenthesized_expression
-          (member_expression
-            (identifier)
-            (property_identifier))))
       (method_definition
+        (decorator
+          (parenthesized_expression
+            (member_expression
+              (identifier)
+              (property_identifier))))
         (property_identifier)
         (formal_parameters)
         (statement_block)))))

tsx/src/grammar.json

@@ -6586,17 +6586,6 @@
               {
                 "type": "SEQ",
                 "members": [
-                  {
-                    "type": "REPEAT",
-                    "content": {
-                      "type": "FIELD",
-                      "name": "decorator",
-                      "content": {
-                        "type": "SYMBOL",
-                        "name": "decorator"
-                      }
-                    }
-                  },
                   {
                     "type": "SYMBOL",
                     "name": "method_definition"
@@ -6873,6 +6862,17 @@
       "content": {
         "type": "SEQ",
         "members": [
+          {
+            "type": "REPEAT",
+            "content": {
+              "type": "FIELD",
+              "name": "decorator",
+              "content": {
+                "type": "SYMBOL",
+                "name": "decorator"
+              }
+            }
+          },
           {
             "type": "CHOICE",
             "members": [

tsx/src/node-types.json

@@ -1407,18 +1407,7 @@
   {
     "type": "class_body",
     "named": true,
-    "fields": {
-      "decorator": {
-        "multiple": true,
-        "required": false,
-        "types": [
-          {
-            "type": "decorator",
-            "named": true
-          }
-        ]
-      }
-    },
+    "fields": {},
     "children": {
       "multiple": true,
       "required": false,
@@ -3686,6 +3675,16 @@
           }
         ]
       },
+      "decorator": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "decorator",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": true,
@@ -6097,11 +6096,11 @@
   },
   {
     "type": "number",
-    "named": true
+    "named": false
   },
   {
     "type": "number",
-    "named": false
+    "named": true
   },
   {
     "type": "object",