Remove specific named body fields

tree-sitter · Jul 23, 2022 · ec7fdab · ec7fdab
1 parent 99381fb
commit ec7fdab
Show file tree

Hide file tree

Showing 5 changed files with 265 additions and 278 deletions.
diff --git a/grammar.js b/grammar.js
@@ -159,7 +159,7 @@ module.exports = grammar({
         seq(
           field('parameters', alias($.parameters, $.method_parameters)),
           choice(
-            seq(optional($._terminator), optional(field('method_body', $.body_statement)), 'end'),
+            seq(optional($._terminator), optional(field('body', $.body_statement)), 'end'),
             $._body_expr
           )
 
@@ -169,7 +169,7 @@ module.exports = grammar({
             field('parameters', alias($.bare_parameters, $.method_parameters))
           ),
           $._terminator,
-          optional(field('method_body', $.body_statement)),
+          optional(field('body', $.body_statement)),
           'end'
         ),
       ),
@@ -266,7 +266,7 @@ module.exports = grammar({
       field('name', choice($.constant, $.scope_resolution)),
       field('superclass', optional($.superclass)),
       $._terminator,
-      optional(field('namespace_body', $.body_statement)),
+      optional(field('body', $.body_statement)),
       'end'
     ),
 
@@ -282,15 +282,15 @@ module.exports = grammar({
       alias($._singleton_class_left_angle_left_langle, '<<'),
       field('value', $._arg),
       $._terminator,
-      optional(field('namespace_body', $.body_statement)),
+      optional(field('body', $.body_statement)),
       'end'
     ),
 
     module: $ => seq(
       'module',
       field('name', choice($.constant, $.scope_resolution)),
       choice(
-        seq($._terminator, optional(field('namespace_body', $.body_statement)), 'end'),
+        seq($._terminator, optional(field('body', $.body_statement)), 'end'),
         'end'
       )
     ),
@@ -830,7 +830,7 @@ module.exports = grammar({
         field('parameters', $.block_parameters),
         optional($._terminator)
       )),
-      optional(field('do_block_body', $.body_statement)),
+      optional(field('body', $.body_statement)),
       'end'
     ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -341,7 +341,7 @@
                           "members": [
                             {
                               "type": "FIELD",
-                              "name": "method_body",
+                              "name": "body",
                               "content": {
                                 "type": "SYMBOL",
                                 "name": "body_statement"
@@ -399,7 +399,7 @@
                   "members": [
                     {
                       "type": "FIELD",
-                      "name": "method_body",
+                      "name": "body",
                       "content": {
                         "type": "SYMBOL",
                         "name": "body_statement"
@@ -954,7 +954,7 @@
           "members": [
             {
               "type": "FIELD",
-              "name": "namespace_body",
+              "name": "body",
               "content": {
                 "type": "SYMBOL",
                 "name": "body_statement"
@@ -1088,7 +1088,7 @@
           "members": [
             {
               "type": "FIELD",
-              "name": "namespace_body",
+              "name": "body",
               "content": {
                 "type": "SYMBOL",
                 "name": "body_statement"
@@ -1144,7 +1144,7 @@
                   "members": [
                     {
                       "type": "FIELD",
-                      "name": "namespace_body",
+                      "name": "body",
                       "content": {
                         "type": "SYMBOL",
                         "name": "body_statement"
@@ -4905,7 +4905,7 @@
           "members": [
             {
               "type": "FIELD",
-              "name": "do_block_body",
+              "name": "body",
               "content": {
                 "type": "SYMBOL",
                 "name": "body_statement"

diff --git a/src/node-types.json b/src/node-types.json
@@ -1380,26 +1380,26 @@
     "type": "class",
     "named": true,
     "fields": {
-      "name": {
+      "body": {
         "multiple": false,
-        "required": true,
+        "required": false,
         "types": [
           {
-            "type": "constant",
-            "named": true
-          },
-          {
-            "type": "scope_resolution",
+            "type": "body_statement",
             "named": true
           }
         ]
       },
-      "namespace_body": {
+      "name": {
         "multiple": false,
-        "required": false,
+        "required": true,
         "types": [
           {
-            "type": "body_statement",
+            "type": "constant",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
             "named": true
           }
         ]
@@ -1596,7 +1596,7 @@
     "type": "do_block",
     "named": true,
     "fields": {
-      "do_block_body": {
+      "body": {
         "multiple": false,
         "required": false,
         "types": [
@@ -2338,7 +2338,7 @@
     "type": "method",
     "named": true,
     "fields": {
-      "method_body": {
+      "body": {
         "multiple": false,
         "required": false,
         "types": [
@@ -2435,26 +2435,26 @@
     "type": "module",
     "named": true,
     "fields": {
-      "name": {
+      "body": {
         "multiple": false,
-        "required": true,
+        "required": false,
         "types": [
           {
-            "type": "constant",
-            "named": true
-          },
-          {
-            "type": "scope_resolution",
+            "type": "body_statement",
             "named": true
           }
         ]
       },
-      "namespace_body": {
+      "name": {
         "multiple": false,
-        "required": false,
+        "required": true,
         "types": [
           {
-            "type": "body_statement",
+            "type": "constant",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
             "named": true
           }
         ]
@@ -2995,7 +2995,7 @@
     "type": "singleton_class",
     "named": true,
     "fields": {
-      "namespace_body": {
+      "body": {
         "multiple": false,
         "required": false,
         "types": [
@@ -3021,7 +3021,7 @@
     "type": "singleton_method",
     "named": true,
     "fields": {
-      "method_body": {
+      "body": {
         "multiple": false,
         "required": false,
         "types": [