feat: crude trailing modifier support

nvim-neorg · Nov 9, 2021 · 22ae523 · 22ae523
1 parent 3efff85
commit 22ae523
Show file tree

Hide file tree

Showing 5 changed files with 261 additions and 67 deletions.
diff --git a/grammar.js b/grammar.js
@@ -15,11 +15,23 @@ module.exports = grammar({
 
         keyword: $ => /[^\s:]+/,
 
-        value: $ => /[^\n]+/,
+        value: $ => seq(
+            optional(
+                repeat($._text_with_trailing_modifier)
+            ),
+            $._text_till_eol
+        ),
 
         _separator: $ => ":",
 
-        _space: $ => /\s+/
+        _space: $ => /\s+/,
+
+        _text_till_eol: $ => /[^(\~\n)]+/,
+
+        _text_with_trailing_modifier: $ => seq(
+            $._text_till_eol,
+            "\~\n"
+        )
 
     }
 });
diff --git a/src/grammar.json b/src/grammar.json
@@ -34,8 +34,28 @@
       "value": "[^\\s:]+"
     },
     "value": {
-      "type": "PATTERN",
-      "value": "[^\\n]+"
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_text_with_trailing_modifier"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_text_till_eol"
+        }
+      ]
     },
     "_separator": {
       "type": "STRING",
@@ -44,6 +64,23 @@
     "_space": {
       "type": "PATTERN",
       "value": "\\s+"
+    },
+    "_text_till_eol": {
+      "type": "PATTERN",
+      "value": "[^(\\~\\n)]+"
+    },
+    "_text_with_trailing_modifier": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_text_till_eol"
+        },
+        {
+          "type": "STRING",
+          "value": "~\n"
+        }
+      ]
     }
   },
   "extras": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -33,12 +33,17 @@
       ]
     }
   },
+  {
+    "type": "value",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "keyword",
     "named": true
   },
   {
-    "type": "value",
-    "named": true
+    "type": "~\n",
+    "named": false
   }
 ]