fix: multi word descriptions

nvim-neorg · Nov 9, 2021 · ab7f37f · ab7f37f
1 parent 20538ef
commit ab7f37f
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 180 deletions.
diff --git a/grammar.js b/grammar.js
@@ -15,23 +15,11 @@ module.exports = grammar({
 
         keyword: $ => /[^\s:]+/,
 
-        description: $ => seq(
-            $._word,
-            optional(
-                repeat(
-                    seq(
-                        $._space,
-                        $._word
-                    )
-                )
-            )
-        ),
+        description: $ => /[^\n]+/,
 
         _separator: $ => ":",
 
-        _space: $ => /\s+/,
-
-        _word: $ => /\S+/
+        _space: $ => /\s+/
 
     }
 });
diff --git a/src/grammar.json b/src/grammar.json
@@ -34,37 +34,8 @@
       "value": "[^\\s:]+"
     },
     "description": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_word"
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_space"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "_word"
-                  }
-                ]
-              }
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        }
-      ]
+      "type": "PATTERN",
+      "value": "[^\\n]+"
     },
     "_separator": {
       "type": "STRING",
@@ -73,10 +44,6 @@
     "_space": {
       "type": "PATTERN",
       "value": "\\s+"
-    },
-    "_word": {
-      "type": "PATTERN",
-      "value": "\\S+"
     }
   },
   "extras": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -1,9 +1,4 @@
 [
-  {
-    "type": "description",
-    "named": true,
-    "fields": {}
-  },
   {
     "type": "metadata",
     "named": true,
@@ -38,6 +33,10 @@
       ]
     }
   },
+  {
+    "type": "description",
+    "named": true
+  },
   {
     "type": "keyword",
     "named": true