fix: support comments as part of key value lists

polarmutex · Mar 29, 2024 · c25f803 · c25f803
1 parent 9f6eb73
commit c25f803
Show file tree

Hide file tree

Showing 5 changed files with 7,723 additions and 5,191 deletions.
diff --git a/grammar.js b/grammar.js
@@ -211,7 +211,7 @@ module.exports = grammar({
                             $.posting,
                             seq(
                                 $._indent,
-                                $.comment,
+                                field("comment", $.comment),
                                 $._eol
                             )
                         )
@@ -326,7 +326,12 @@ module.exports = grammar({
                     ),
                     seq(
                         $._key_value_line
-                    )
+                    ),
+                    seq(
+                        $._indent,
+                        field("comment", $.comment),
+                        $._eol
+                    ),
                 )
             ),
 
@@ -522,6 +527,7 @@ module.exports = grammar({
                 "price",
                 field("currency", $.currency),
                 field("amount", $.amount),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),
@@ -532,6 +538,7 @@ module.exports = grammar({
                 "event",
                 field("type", $.string),
                 field("desc", $.string),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),
@@ -542,6 +549,7 @@ module.exports = grammar({
                 "query",
                 field("name", $.string),
                 field("query", $.string),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),
@@ -552,6 +560,7 @@ module.exports = grammar({
                 "note",
                 field("account", $.account),
                 field("note", $.string),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),
@@ -565,6 +574,7 @@ module.exports = grammar({
                 field("account", $.account),
                 field("filename", $.filename),
                 field("tags_links", optional($.tags_links)),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),
@@ -590,6 +600,7 @@ module.exports = grammar({
                         $.custom_value
                     ),
                 )),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),

diff --git a/src/grammar.json b/src/grammar.json
@@ -653,8 +653,12 @@
                         "name": "_indent"
                       },
                       {
-                        "type": "SYMBOL",
-                        "name": "comment"
+                        "type": "FIELD",
+                        "name": "comment",
+                        "content": {
+                          "type": "SYMBOL",
+                          "name": "comment"
+                        }
                       },
                       {
                         "type": "SYMBOL",
@@ -1174,6 +1178,27 @@
                 "name": "_key_value_line"
               }
             ]
+          },
+          {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_indent"
+              },
+              {
+                "type": "FIELD",
+                "name": "comment",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "comment"
+                }
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_eol"
+              }
+            ]
           }
         ]
       }
@@ -1920,6 +1945,22 @@
             "name": "amount"
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"
@@ -1969,6 +2010,22 @@
             "name": "string"
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"
@@ -2018,6 +2075,22 @@
             "name": "string"
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"
@@ -2067,6 +2140,22 @@
             "name": "string"
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"
@@ -2136,6 +2225,22 @@
             ]
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"
@@ -2225,6 +2330,22 @@
             ]
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"