Accept name = expr in attributes

ninevra · ninevra · commit ecbce1efbec9 · 2022-03-08T01:03:37.000-08:00
Supports the syntax added in the extended_key_value_attributes feature.
diff --git a/grammar.js b/grammar.js
@@ -278,15 +278,15 @@ module.exports = grammar({
     custom_attr: $ => seq(
       $._path,
       optional(choice(
-        seq('=', field('value', $._literal)),
+        seq('=', field('value', $._expression)),
         field('arguments', $.delim_token_tree)
       ))
     ),
 
     built_in_attr: $ => seq(
       $._built_in_attr_path,
       optional(choice(
-        seq('=', field('value', $._literal)),
+        seq('=', field('value', $._expression)),
         field('arguments', $.meta_arguments)
       ))
     ),
@@ -298,7 +298,7 @@ module.exports = grammar({
     meta_item: $ => seq(
       $._path,
       optional(choice(
-        seq('=', field('value', $._literal)),
+        seq('=', field('value', $._expression)),
         field('arguments', $.meta_arguments)
       ))
     ),
diff --git a/src/grammar.json b/src/grammar.json
@@ -978,7 +978,7 @@
                       "name": "value",
                       "content": {
                         "type": "SYMBOL",
-                        "name": "_literal"
+                        "name": "_expression"
                       }
                     }
                   ]
@@ -1025,7 +1025,7 @@
                       "name": "value",
                       "content": {
                         "type": "SYMBOL",
-                        "name": "_literal"
+                        "name": "_expression"
                       }
                     }
                   ]
@@ -1482,7 +1482,7 @@
                       "name": "value",
                       "content": {
                         "type": "SYMBOL",
-                        "name": "_literal"
+                        "name": "_expression"
                       }
                     }
                   ]
diff --git a/src/node-types.json b/src/node-types.json
@@ -658,7 +658,7 @@
         "required": false,
         "types": [
           {
-            "type": "_literal",
+            "type": "_expression",
             "named": true
           }
         ]
@@ -2822,7 +2822,7 @@
         "required": false,
         "types": [
           {
-            "type": "_literal",
+            "type": "_expression",
             "named": true
           }
         ]
diff --git a/src/parser.c b/src/parser.c

Original file line number	Diff line number	Diff line change
`@@ -978,7 +978,7 @@`
`978`	`978`	`"name": "value",`
`979`	`979`	`"content": {`
`980`	`980`	`"type": "SYMBOL",`
`981`		`- "name": "_literal"`
	`981`	`+ "name": "_expression"`
`982`	`982`	`}`
`983`	`983`	`}`
`984`	`984`	`]`
`@@ -1025,7 +1025,7 @@`
`1025`	`1025`	`"name": "value",`
`1026`	`1026`	`"content": {`
`1027`	`1027`	`"type": "SYMBOL",`
`1028`		`- "name": "_literal"`
	`1028`	`+ "name": "_expression"`
`1029`	`1029`	`}`
`1030`	`1030`	`}`
`1031`	`1031`	`]`
`@@ -1482,7 +1482,7 @@`
`1482`	`1482`	`"name": "value",`
`1483`	`1483`	`"content": {`
`1484`	`1484`	`"type": "SYMBOL",`
`1485`		`- "name": "_literal"`
	`1485`	`+ "name": "_expression"`
`1486`	`1486`	`}`
`1487`	`1487`	`}`
`1488`	`1488`	`]`
Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@`
`658`	`658`	`"required": false,`
`659`	`659`	`"types": [`
`660`	`660`	`{`
`661`		`- "type": "_literal",`
	`661`	`+ "type": "_expression",`
`662`	`662`	`"named": true`
`663`	`663`	`}`
`664`	`664`	`]`
`@@ -2822,7 +2822,7 @@`
`2822`	`2822`	`"required": false,`
`2823`	`2823`	`"types": [`
`2824`	`2824`	`{`
`2825`		`- "type": "_literal",`
	`2825`	`+ "type": "_expression",`
`2826`	`2826`	`"named": true`
`2827`	`2827`	`}`
`2828`	`2828`	`]`