one-line module/class without ; after name

Author: aibaars

grammar.js

@@ -262,8 +262,10 @@ module.exports = grammar({
     class: $ => seq(
       'class',
       field('name', choice($.constant, $.scope_resolution)),
-      field('superclass', optional($.superclass)),
-      $._terminator,
+      choice(
+        seq(field('superclass', $.superclass), $._terminator),
+        optional($._terminator)
+      ),
       $._body_statement
     ),
 
@@ -280,10 +282,7 @@ module.exports = grammar({
     module: $ => seq(
       'module',
       field('name', choice($.constant, $.scope_resolution)),
-      choice(
-        seq($._terminator, $._body_statement),
-        'end'
-      )
+      seq(optional($._terminator), $._body_statement),
     ),
 
     return_command: $ => prec.left(seq('return', alias($.command_argument_list, $.argument_list))),

src/grammar.json

@@ -913,24 +913,38 @@
           }
         },
         {
-          "type": "FIELD",
-          "name": "superclass",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "superclass"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          }
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_terminator"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "FIELD",
+                  "name": "superclass",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "superclass"
+                  }
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_terminator"
+                }
+              ]
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_terminator"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
+          ]
         },
         {
           "type": "SYMBOL",
@@ -1010,24 +1024,23 @@
           }
         },
         {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
             {
-              "type": "SEQ",
+              "type": "CHOICE",
               "members": [
                 {
                   "type": "SYMBOL",
                   "name": "_terminator"
                 },
                 {
-                  "type": "SYMBOL",
-                  "name": "_body_statement"
+                  "type": "BLANK"
                 }
               ]
             },
             {
-              "type": "STRING",
-              "value": "end"
+              "type": "SYMBOL",
+              "name": "_body_statement"
             }
           ]
         }