fix not repeating attributes

grammar.js

@@ -3,7 +3,7 @@ module.exports = grammar({
 
   extras: $ => [
 	/\s/,
-	/[\r?\n]/,
+	/\r?\n/,
 	$.comment
   ],
 
@@ -66,7 +66,7 @@ module.exports = grammar({
 	plugin: $ => seq(
 		$.plugin_name,
 		"{",
-		field("attributes", optional(seq($.attribute))),
+		field("attributes", optional(repeat1($.attribute))),
 		"}",
 	),
 
@@ -75,11 +75,12 @@ module.exports = grammar({
 		$.string
 	),
 
+	arrow: $ => "=>",
+
 	attribute: $ => seq(
 		$.name,
-		"=>",
-		$.value,
-		/\s*\r?\n/
+		$.arrow,
+		$.value
 	),
 
 	branch: $ => seq(
@@ -161,8 +162,8 @@ module.exports = grammar({
 	),
 
 	hashentry: $ => seq(
-		choice($.number, $.bareword, $.string),
-		"=>",
+		field("name", choice($.number, $.bareword, $.string)),
+		$.arrow,
 		$.value
 	),
 

queries/highlights.scm

@@ -27,7 +27,7 @@
 ; Operators
 
 [
-"=>"
+(arrow)
 ] @operator
 
 [

src/grammar.json

@@ -288,13 +288,11 @@
             "type": "CHOICE",
             "members": [
               {
-                "type": "SEQ",
-                "members": [
-                  {
+                "type": "REPEAT1",
+                "content": {
                   "type": "SYMBOL",
                   "name": "attribute"
                 }
-                ]
               },
               {
                 "type": "BLANK"
@@ -321,6 +319,10 @@
         }
       ]
     },
+    "arrow": {
+      "type": "STRING",
+      "value": "=>"
+    },
     "attribute": {
       "type": "SEQ",
       "members": [
@@ -329,16 +331,12 @@
           "name": "name"
         },
         {
-          "type": "STRING",
-          "value": "=>"
+          "type": "SYMBOL",
+          "name": "arrow"
         },
         {
           "type": "SYMBOL",
           "name": "value"
-        },
-        {
-          "type": "PATTERN",
-          "value": "\\s*\\r?\\n"
         }
       ]
     },
@@ -830,6 +828,9 @@
       "type": "SEQ",
       "members": [
         {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
             "type": "CHOICE",
             "members": [
               {
@@ -845,10 +846,11 @@
                 "name": "string"
               }
             ]
+          }
         },
         {
-          "type": "STRING",
-          "value": "=>"
+          "type": "SYMBOL",
+          "name": "arrow"
         },
         {
           "type": "SYMBOL",
@@ -997,7 +999,7 @@
     },
     {
       "type": "PATTERN",
-      "value": "[\\r?\\n]"
+      "value": "\\r?\\n"
     },
     {
       "type": "SYMBOL",

src/node-types.json

@@ -22,6 +22,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "arrow",
+          "named": true
+        },
         {
           "type": "name",
           "named": true
@@ -253,9 +257,9 @@
   {
     "type": "hashentry",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
+    "fields": {
+      "name": {
+        "multiple": false,
         "required": true,
         "types": [
           {
@@ -269,6 +273,17 @@
           {
             "type": "string",
             "named": true
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "arrow",
+          "named": true
         },
         {
           "type": "value",
@@ -422,7 +437,7 @@
     "named": true,
     "fields": {
       "attributes": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -699,10 +714,6 @@
     "type": "==",
     "named": false
   },
-  {
-    "type": "=>",
-    "named": false
-  },
   {
     "type": "=~",
     "named": false
@@ -731,6 +742,10 @@
     "type": "and",
     "named": false
   },
+  {
+    "type": "arrow",
+    "named": true
+  },
   {
     "type": "bareword",
     "named": true

tests/test.logstash

@@ -7,6 +7,10 @@ input {
 	} else {
 		mongodb {
 			server => "asdf"
+			server => "asdf"
+			server => "asdf"
+			server => "asdf"
+			server => "asdf"
 		}
 	}
 }