fix: incorrect detection of trailing modifiers (#3)

nvim-neorg · Feb 22, 2022 · 323ef05 · 323ef05
1 parent 35d9f25
commit 323ef05
Show file tree

Hide file tree

Showing 4 changed files with 606 additions and 458 deletions.
diff --git a/grammar.js b/grammar.js
@@ -10,11 +10,17 @@ module.exports = grammar({
         key: _ => /[^\-\s:][^\s:]*/,
 
         value: $ => seq(
-            /[^\s\[\]\{\}][^\n\[\]\{\}(\~\n)]*/,
+            /[^\s\[\]\{\}][^\n\[\]\{\}\~]+/,
             optional(
-                seq(
-                    "~\n",
-                    alias($.value, "_value")
+                choice(
+                    seq(
+                        "~",
+                        /[^\n\[\]\{\}\~]+/,
+                    ),
+                    seq(
+                        "~\n",
+                        alias($.value, "_value")
+                    )
                 )
             )
         ),

diff --git a/src/grammar.json b/src/grammar.json
@@ -26,26 +26,44 @@
       "members": [
         {
           "type": "PATTERN",
-          "value": "[^\\s\\[\\]\\{\\}][^\\n\\[\\]\\{\\}(\\~\\n)]*"
+          "value": "[^\\s\\[\\]\\{\\}][^\\n\\[\\]\\{\\}\\~]+"
         },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
+              "type": "CHOICE",
               "members": [
                 {
-                  "type": "STRING",
-                  "value": "~\n"
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "~"
+                    },
+                    {
+                      "type": "PATTERN",
+                      "value": "[^\\n\\[\\]\\{\\}\\~]+"
+                    }
+                  ]
                 },
                 {
-                  "type": "ALIAS",
-                  "content": {
-                    "type": "SYMBOL",
-                    "name": "value"
-                  },
-                  "named": false,
-                  "value": "_value"
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "~\n"
+                    },
+                    {
+                      "type": "ALIAS",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "value"
+                      },
+                      "named": false,
+                      "value": "_value"
+                    }
+                  ]
                 }
               ]
             },

diff --git a/src/node-types.json b/src/node-types.json
@@ -130,6 +130,10 @@
     "type": "}",
     "named": false
   },
+  {
+    "type": "~",
+    "named": false
+  },
   {
     "type": "~\n",
     "named": false