feat: add argument nodes

Author: vigoux

corpus/arguments.txt

@@ -0,0 +1,31 @@
+================================================================================
+Simple argument
+================================================================================
+This in an argument: {arg}
+--------------------------------------------------------------------------------
+
+(help_file
+  (line
+    (word)
+    (word)
+    (word)
+    (word)
+    (argument
+      (word))))
+
+================================================================================
+Multiple arguments on the same line
+================================================================================
+
+{foo} {bar} {baz}
+
+--------------------------------------------------------------------------------
+
+(help_file
+  (line
+    (argument
+      (word))
+    (argument
+      (word))
+    (argument
+      (word))))

grammar.js

@@ -33,6 +33,7 @@ module.exports = grammar({
         $.option,
         $.hotlink,
         $.backtick,
+        $.argument,
       ),
 
     column_heading: ($) =>
@@ -48,9 +49,10 @@ module.exports = grammar({
     option: ($) => wrapped_word($, "'", 'name'),
     hotlink: ($) => wrapped_word($, '|', 'destination'),
     backtick: ($) => wrapped_word($, '`', 'content'),
+    argument: ($) => seq("{", field('name', $.word), token.immediate('}'))
   },
 });
 
 function wrapped_word($, char, fname) {
-  return seq(char, field(fname, $.word), char);
+  return seq(char, field(fname, $.word), token.immediate(char));
 }

src/grammar.json

@@ -129,6 +129,10 @@
         {
           "type": "SYMBOL",
           "name": "backtick"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "argument"
         }
       ]
     },
@@ -195,8 +199,11 @@
           }
         },
         {
-          "type": "STRING",
-          "value": "*"
+          "type": "IMMEDIATE_TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "*"
+          }
         }
       ]
     },
@@ -216,8 +223,11 @@
           }
         },
         {
-          "type": "STRING",
-          "value": "'"
+          "type": "IMMEDIATE_TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "'"
+          }
         }
       ]
     },
@@ -237,8 +247,11 @@
           }
         },
         {
-          "type": "STRING",
-          "value": "|"
+          "type": "IMMEDIATE_TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "|"
+          }
         }
       ]
     },
@@ -257,9 +270,36 @@
             "name": "word"
           }
         },
+        {
+          "type": "IMMEDIATE_TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "`"
+          }
+        }
+      ]
+    },
+    "argument": {
+      "type": "SEQ",
+      "members": [
         {
           "type": "STRING",
-          "value": "`"
+          "value": "{"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "word"
+          }
+        },
+        {
+          "type": "IMMEDIATE_TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "}"
+          }
         }
       ]
     }

src/node-types.json

@@ -1,4 +1,20 @@
 [
+  {
+    "type": "argument",
+    "named": true,
+    "fields": {
+      "name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "word",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "backtick",
     "named": true,
@@ -111,6 +127,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "argument",
+          "named": true
+        },
         {
           "type": "backtick",
           "named": true
@@ -202,8 +222,16 @@
     "type": "word",
     "named": true
   },
+  {
+    "type": "{",
+    "named": false
+  },
   {
     "type": "|",
     "named": false
+  },
+  {
+    "type": "}",
+    "named": false
   }
 ]