breaking change: remove differentiation of foreplay and document_content

nvim-neorg · Nov 9, 2021 · 51fdb9e · 51fdb9e
1 parent 941bb61
commit 51fdb9e
Show file tree

Hide file tree

Showing 15 changed files with 189,547 additions and 190,184 deletions.
diff --git a/grammar.js b/grammar.js
@@ -151,27 +151,7 @@ module.exports = grammar({
     ],
 
     rules: {
-        document: $ =>
-        seq(
-            optional($.foreplay),
-            optional($.document_content),
-        ),
-
-        foreplay: $ =>
-        prec.right(0,
-            repeat1(
-                prec(2,
-                    choice(
-                        $._paragraph_break,
-                        $._line_break,
-                        $.ranged_tag,
-                        $.insertion,
-                    )
-                ),
-            )
-        ),
-
-        document_content: $ => repeat1(
+        document: $ => repeat1(
             choice(
                 prec(1,
                     choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -2,67 +2,6 @@
   "name": "norg",
   "rules": {
     "document": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "foreplay"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "document_content"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        }
-      ]
-    },
-    "foreplay": {
-      "type": "PREC_RIGHT",
-      "value": 0,
-      "content": {
-        "type": "REPEAT1",
-        "content": {
-          "type": "PREC",
-          "value": 2,
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_paragraph_break"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "_line_break"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "ranged_tag"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "insertion"
-              }
-            ]
-          }
-        }
-      }
-    },
-    "document_content": {
       "type": "REPEAT1",
       "content": {
         "type": "CHOICE",

diff --git a/src/node-types.json b/src/node-types.json
@@ -249,25 +249,6 @@
     "type": "document",
     "named": true,
     "fields": {},
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
-        {
-          "type": "document_content",
-          "named": true
-        },
-        {
-          "type": "foreplay",
-          "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "document_content",
-    "named": true,
-    "fields": {},
     "children": {
       "multiple": true,
       "required": false,
@@ -373,25 +354,6 @@
       ]
     }
   },
-  {
-    "type": "foreplay",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
-        {
-          "type": "insertion",
-          "named": true
-        },
-        {
-          "type": "ranged_tag",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "generic_list",
     "named": true,