fix: broken parsing of values with special chars

nvim-neorg · Oct 9, 2022 · e93dcbc · e93dcbc
1 parent 4687b53
commit e93dcbc
Show file tree

Hide file tree

Showing 3 changed files with 637 additions and 545 deletions.
diff --git a/grammar.js b/grammar.js
@@ -10,12 +10,12 @@ module.exports = grammar({
         key: _ => /[^\-\s:][^\s:]*/,
 
         value: $ => seq(
-            /[^\s\[\]\{\}][^\n\[\]\{\}\~]*/,
+            /[^\s][^\n\~]*/,
             optional(
                 choice(
                     seq(
                         "~",
-                        /[^\n\[\]\{\}\~]+/,
+                        /[^\n\~]+/,
                     ),
                     seq(
                         "~\n",
@@ -47,14 +47,12 @@ module.exports = grammar({
             $.key,
             token.immediate(':'),
             /[\t\v ]*/,
-            seq(
-                choice(
-                    $.array,
-                    $.value,
-                    $.object,
-                    '\n',
-                ),
+            choice(
+                $.array,
+                $.value,
+                $.object,
             ),
+            optional(token.immediate('\n')),
         ),
 
         delimiter: _ => seq(

diff --git a/src/grammar.json b/src/grammar.json
@@ -26,7 +26,7 @@
       "members": [
         {
           "type": "PATTERN",
-          "value": "[^\\s\\[\\]\\{\\}][^\\n\\[\\]\\{\\}\\~]*"
+          "value": "[^\\s][^\\n\\~]*"
         },
         {
           "type": "CHOICE",
@@ -43,7 +43,7 @@
                     },
                     {
                       "type": "PATTERN",
-                      "value": "[^\\n\\[\\]\\{\\}\\~]+"
+                      "value": "[^\\n\\~]+"
                     }
                   ]
                 },
@@ -146,28 +146,34 @@
           "value": "[\\t\\v ]*"
         },
         {
-          "type": "SEQ",
+          "type": "CHOICE",
           "members": [
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "array"
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "value"
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "object"
-                },
-                {
-                  "type": "STRING",
-                  "value": "\n"
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "array"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "value"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "object"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "IMMEDIATE_TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": "\n"
+              }
+            },
+            {
+              "type": "BLANK"
             }
           ]
         }