Merge pull request #130 from cfroystad/attribute_group

Adds attribute_group node to complete attributes support
tree-sitter · May 27, 2022 · c8955e9 · c8955e9
2 parents 6be89d5 + f53b758
commit c8955e9
Show file tree

Hide file tree

Showing 5 changed files with 52,546 additions and 51,706 deletions.
diff --git a/grammar.js b/grammar.js
@@ -1163,11 +1163,14 @@ module.exports = grammar({
       seq('[', commaSep($.array_element_initializer), optional(','), ']')
     ),
 
-    attribute_list: $ => repeat1(seq(
+    attribute_group: $ => seq(
       '#[',
       commaSep1($.attribute),
+      optional(','),
       ']',
-    )),
+    ),
+
+    attribute_list: $ => repeat1($.attribute_group),
 
     attribute: $ => seq(
       choice($.name, alias($._reserved_identifier, $.name), $.qualified_name),

diff --git a/src/grammar.json b/src/grammar.json
@@ -6499,45 +6499,61 @@
         }
       ]
     },
+    "attribute_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "#["
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "attribute"
+            },
+            {
+              "type": "REPEAT",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "attribute"
+                  }
+                ]
+              }
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ","
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "]"
+        }
+      ]
+    },
     "attribute_list": {
       "type": "REPEAT1",
       "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "#["
-          },
-          {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "attribute"
-              },
-              {
-                "type": "REPEAT",
-                "content": {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": ","
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "attribute"
-                    }
-                  ]
-                }
-              }
-            ]
-          },
-          {
-            "type": "STRING",
-            "value": "]"
-          }
-        ]
+        "type": "SYMBOL",
+        "name": "attribute_group"
       }
     },
     "attribute": {

diff --git a/src/node-types.json b/src/node-types.json
@@ -683,7 +683,7 @@
     }
   },
   {
-    "type": "attribute_list",
+    "type": "attribute_group",
     "named": true,
     "fields": {},
     "children": {
@@ -697,6 +697,21 @@
       ]
     }
   },
+  {
+    "type": "attribute_list",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "attribute_group",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "augmented_assignment_expression",
     "named": true,
@@ -5044,11 +5059,11 @@
   },
   {
     "type": "float",
-    "named": false
+    "named": true
   },
   {
     "type": "float",
-    "named": true
+    "named": false
   },
   {
     "type": "fn",
@@ -5144,11 +5159,11 @@
   },
   {
     "type": "null",
-    "named": false
+    "named": true
   },
   {
     "type": "null",
-    "named": true
+    "named": false
   },
   {
     "type": "or",