Accept name = expr in attributes

ninevra · ninevra · commit f27d28bcfe8e · 2022-03-08T00:38:43.000-08:00
Supports the syntax added in the extended_key_value_attributes feature.
diff --git a/grammar.js b/grammar.js
@@ -273,7 +273,7 @@ module.exports = grammar({
     custom_attr: $ => seq(
       $._path,
       optional(choice(
-        seq('=', field('value', $._literal)),
+        seq('=', field('value', $._expression)),
         field('arguments', $.delim_token_tree)
       ))
     ),
@@ -297,7 +297,7 @@ module.exports = grammar({
     built_in_attr: $ => seq(
       $._built_in_attr_path,
       optional(choice(
-        seq('=', field('value', $._literal)),
+        seq('=', field('value', $._expression)),
         field('arguments', $.meta_arguments)
       ))
     ),
@@ -309,7 +309,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
@@ -974,7 +974,7 @@
                       "name": "value",
                       "content": {
                         "type": "SYMBOL",
-                        "name": "_literal"
+                        "name": "_expression"
                       }
                     }
                   ]
@@ -1112,7 +1112,7 @@
                       "name": "value",
                       "content": {
                         "type": "SYMBOL",
-                        "name": "_literal"
+                        "name": "_expression"
                       }
                     }
                   ]
@@ -1569,7 +1569,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
           }
         ]
@@ -2826,7 +2826,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
`@@ -974,7 +974,7 @@`
`974`	`974`	`"name": "value",`
`975`	`975`	`"content": {`
`976`	`976`	`"type": "SYMBOL",`
`977`		`- "name": "_literal"`
	`977`	`+ "name": "_expression"`
`978`	`978`	`}`
`979`	`979`	`}`
`980`	`980`	`]`
`@@ -1112,7 +1112,7 @@`
`1112`	`1112`	`"name": "value",`
`1113`	`1113`	`"content": {`
`1114`	`1114`	`"type": "SYMBOL",`
`1115`		`- "name": "_literal"`
	`1115`	`+ "name": "_expression"`
`1116`	`1116`	`}`
`1117`	`1117`	`}`
`1118`	`1118`	`]`
`@@ -1569,7 +1569,7 @@`
`1569`	`1569`	`"name": "value",`
`1570`	`1570`	`"content": {`
`1571`	`1571`	`"type": "SYMBOL",`
`1572`		`- "name": "_literal"`
	`1572`	`+ "name": "_expression"`
`1573`	`1573`	`}`
`1574`	`1574`	`}`
`1575`	`1575`	`]`
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`	`]`
`@@ -2826,7 +2826,7 @@`
`2826`	`2826`	`"required": false,`
`2827`	`2827`	`"types": [`
`2828`	`2828`	`{`
`2829`		`- "type": "_literal",`
	`2829`	`+ "type": "_expression",`
`2830`	`2830`	`"named": true`
`2831`	`2831`	`}`
`2832`	`2832`	`]`