fix(headline): be more flexible

Fix #4
neovim · Jul 28, 2022 · 3564c33 · 3564c33
1 parent 1de3ea0
commit 3564c33
Show file tree

Hide file tree

Showing 5 changed files with 613 additions and 405 deletions.
diff --git a/corpus/headline.txt b/corpus/headline.txt
@@ -16,3 +16,15 @@ Text
       (word)))
   (line
     (word)))
+
+
+=====================
+Headline with tag at the start
+=====================
+
+==============================================================================
+*03.1*	Word movement
+
+Text
+
+---------------
diff --git a/grammar.js b/grammar.js
@@ -19,7 +19,7 @@ module.exports = grammar({
       seq(
         field('delimiter', choice(/===.*===/, /---.*---/)),
         '\n',
-        seq(repeat1($.word), $.tag),
+        repeat1($._atom),
         '\n',
       ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -54,20 +54,11 @@
           "value": "\n"
         },
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "REPEAT1",
-              "content": {
-                "type": "SYMBOL",
-                "name": "word"
-              }
-            },
-            {
-              "type": "SYMBOL",
-              "name": "tag"
-            }
-          ]
+          "type": "REPEAT1",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_atom"
+          }
         },
         {
           "type": "STRING",

diff --git a/src/node-types.json b/src/node-types.json
@@ -69,6 +69,22 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "argument",
+          "named": true
+        },
+        {
+          "type": "backtick",
+          "named": true
+        },
+        {
+          "type": "hotlink",
+          "named": true
+        },
+        {
+          "type": "option",
+          "named": true
+        },
         {
           "type": "tag",
           "named": true
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ module.exports = grammar({ @@
           seq(
             field('delimiter', choice(/===.*===/, /---.*---/)),
             '\n',
-            seq(repeat1($.word), $.tag),
+            repeat1($._atom),
             '\n',
           ),
@@ Expand Down @@