🐛 Support set option=value [...]

neomutt · Feb 14, 2024 · b97a853 · b97a853
1 parent 90fc0c5
commit b97a853
Show file tree

Hide file tree

Showing 5 changed files with 6,045 additions and 5,586 deletions.
diff --git a/grammar.js b/grammar.js
@@ -427,19 +427,15 @@ module.exports = grammar({
       ),
     unhook_directive: ($) => command($, "unhook", choice("*", $.hook_type)),
 
-    set_directive: ($) =>
-      command(
-        $,
-        "set",
-        choice(
-          seq(
-            $.option,
-            optional(" "),
-            choice("+=", "-=", "="),
-            optional(" "),
-            choice($.int, $.quadoption, $._string)
-          ),
-          $._options2
+    set_directive: ($) => command($, "set", choice($._options2, $._options3)),
+    _options3: ($) =>
+      spaceSep1(
+        seq(
+          $.option,
+          optional(" "),
+          choice("+=", "-=", "="),
+          optional(" "),
+          choice($.int, $.quadoption, $._string)
         )
       ),
     _options2: ($) => spaceSep1(seq(optional(choice("&", "?")), $.option)),

diff --git a/src/grammar.json b/src/grammar.json
@@ -3193,77 +3193,165 @@
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
+              "type": "SYMBOL",
+              "name": "_options2"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_options3"
+            }
+          ]
+        }
+      ]
+    },
+    "_options3": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "option"
+            },
+            {
+              "type": "CHOICE",
               "members": [
                 {
-                  "type": "SYMBOL",
-                  "name": "option"
+                  "type": "STRING",
+                  "value": " "
                 },
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": " "
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "+="
                 },
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": "+="
-                    },
-                    {
-                      "type": "STRING",
-                      "value": "-="
-                    },
-                    {
-                      "type": "STRING",
-                      "value": "="
-                    }
-                  ]
+                  "type": "STRING",
+                  "value": "-="
                 },
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": " "
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
+                  "type": "STRING",
+                  "value": "="
+                }
+              ]
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": " "
                 },
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "int"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "quadoption"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "_string"
-                    }
-                  ]
+                  "type": "BLANK"
                 }
               ]
             },
             {
-              "type": "SYMBOL",
-              "name": "_options2"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "int"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "quadoption"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_string"
+                }
+              ]
             }
           ]
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": " "
+              },
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "option"
+                  },
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": " "
+                      },
+                      {
+                        "type": "BLANK"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": "+="
+                      },
+                      {
+                        "type": "STRING",
+                        "value": "-="
+                      },
+                      {
+                        "type": "STRING",
+                        "value": "="
+                      }
+                    ]
+                  },
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": " "
+                      },
+                      {
+                        "type": "BLANK"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "int"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "quadoption"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "_string"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
         }
       ]
     },

diff --git a/src/node-types.json b/src/node-types.json
@@ -4868,7 +4868,7 @@
     "named": true,
     "fields": {
       "content": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {