Rename to constructable expression

Co-Authored-By: Max Brunsfeld <[email protected]>

Author: joshvera

grammar.js

@@ -37,7 +37,7 @@ module.exports = grammar({
   ],
 
   inline: $ => [
-    $._new_member_expression,
+    $._constructable_expression,
     $._statement,
     $._expressions,
     $._semicolon,
@@ -388,15 +388,9 @@ module.exports = grammar({
     ),
 
     _expression: $ => choice(
-      $.object,
-      $.array,
+      $._constructable_expression,
       $._jsx_element,
       $.jsx_fragment,
-      $.class,
-      $.anonymous_class,
-      $.function,
-      $.arrow_function,
-      $.generator_function,
 
       $.assignment_expression,
       $.augmented_assignment_expression,
@@ -406,23 +400,7 @@ module.exports = grammar({
       $.ternary_expression,
       $.update_expression,
       $.call_expression,
-      $.member_expression,
-      $.new_expression,
-      $.parenthesized_expression,
-      $.subscript_expression,
       $.yield_expression,
-      $.this,
-
-      $.number,
-      $.string,
-      $.template_string,
-      $.regex,
-      $.true,
-      $.false,
-      $.null,
-      $.undefined,
-      $.identifier,
-      alias($._reserved_identifier, $.identifier)
     ),
 
     yield_expression: $ => prec.right(seq(
@@ -591,12 +569,12 @@ module.exports = grammar({
     new_expression: $ => prec.right(PREC.NEW, seq(
       'new',
 
-      $._new_member_expression,
+      $._constructable_expression,
 
       optional($.arguments)
     )),
 
-    _new_member_expression: $ => choice(
+    _constructable_expression: $ => choice(
       // Primary Expression
       $.this,
       $.identifier,

src/grammar.json

@@ -1386,11 +1386,7 @@
       "members": [
         {
           "type": "SYMBOL",
-          "name": "object"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "array"
+          "name": "_constructable_expression"
         },
         {
           "type": "SYMBOL",
@@ -1400,26 +1396,6 @@
           "type": "SYMBOL",
           "name": "jsx_fragment"
         },
-        {
-          "type": "SYMBOL",
-          "name": "class"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "anonymous_class"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "function"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "arrow_function"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "generator_function"
-        },
         {
           "type": "SYMBOL",
           "name": "assignment_expression"
@@ -1452,74 +1428,9 @@
           "type": "SYMBOL",
           "name": "call_expression"
         },
-        {
-          "type": "SYMBOL",
-          "name": "member_expression"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "new_expression"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "parenthesized_expression"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "subscript_expression"
-        },
         {
           "type": "SYMBOL",
           "name": "yield_expression"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "this"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "number"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "string"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "template_string"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "regex"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "true"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "false"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "null"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "undefined"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "identifier"
-        },
-        {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_reserved_identifier"
-          },
-          "named": true,
-          "value": "identifier"
         }
       ]
     },
@@ -2445,7 +2356,7 @@
           },
           {
             "type": "SYMBOL",
-            "name": "_new_member_expression"
+            "name": "_constructable_expression"
           },
           {
             "type": "CHOICE",
@@ -2462,7 +2373,7 @@
         ]
       }
     },
-    "_new_member_expression": {
+    "_constructable_expression": {
       "type": "CHOICE",
       "members": [
         {
@@ -4978,7 +4889,7 @@
     }
   ],
   "inline": [
-    "_new_member_expression",
+    "_constructable_expression",
     "_statement",
     "_expressions",
     "_semicolon",