simplify object elements

grammar.js

@@ -16,8 +16,6 @@ module.exports = grammar({
   name: 'hcl',
 
   conflicts: $ => [
-    [$.body],
-    [$.object_elem, $.variable_expr],
     [$.attr_splat],
     [$.full_splat],
     // string literals are just quoted template without template stuff
@@ -136,7 +134,7 @@ module.exports = grammar({
     _object_end: $ => '}',
 
     object_elem: $ => seq(
-      choice($.identifier, $.expression),
+      $.expression,
       choice('=', ':'),
       $.expression,
     ),

src/grammar.json

@@ -414,17 +414,8 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "CHOICE",
+          "type": "SYMBOL",
-          "members": [
+          "name": "expression"
-            {
-              "type": "SYMBOL",
-              "name": "identifier"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "expression"
-            }
-          ]
         },
         {
           "type": "CHOICE",
@@ -1219,13 +1210,6 @@
     }
   ],
   "conflicts": [
-    [
-      "body"
-    ],
-    [
-      "object_elem",
-      "variable_expr"
-    ],
     [
       "attr_splat"
     ],

src/node-types.json

@@ -507,10 +507,6 @@
         {
           "type": "expression",
           "named": true
-        },
-        {
-          "type": "identifier",
-          "named": true
         }
       ]
     }

test/corpus/templates.txt

@@ -118,7 +118,9 @@ foo = "${ {a=b}[a] }"
                 (collection_value
                   (object
                     (object_elem
-                      (identifier)
+                      (expression
+                        (variable_expr
+                          (identifier)))
                       (expression
                         (variable_expr
                           (identifier))))))