fixup: delimiters

neovim · Jun 1, 2024 · 8608da5 · 8608da5
1 parent bf52536
commit 8608da5
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 30 deletions.
diff --git a/grammar.js b/grammar.js
@@ -178,7 +178,7 @@ module.exports = grammar({
     // TODO: children should be $.word (plaintext), not $.atom.
     column_heading: ($) => seq(
       alias(seq(choice($._atom_noli, $._uppercase_words), repeat($._atom)), $.heading),
-      '~',
+      alias('~', $.delimiter),
       token.immediate('\n'),
     ),
 

diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
@@ -1,13 +1,19 @@
-(h1) @markup.heading.1
+(h1
+  (delimiter) @markup.heading.1
+  (heading) @markup.heading.1)
 
-(h2) @markup.heading.2
+(h2
+  (delimiter) @markup.heading.2
+  (heading) @markup.heading.2)
 
-(h3) @markup.heading.3
+(h3
+  (heading) @markup.heading.3)
 
-(column_heading) @markup.heading.4
+(column_heading
+  (heading) @markup.heading.4)
 
 (column_heading
-  "~" @markup.heading.4.marker
+  (delimiter) @markup.heading.4.marker
   (#set! conceal ""))
 
 (tag

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json
diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/heading3-column_heading.txt b/test/corpus/heading3-column_heading.txt
@@ -24,7 +24,8 @@ Text
       (column_heading
         (heading
           (word)
-          (word))))
+          (word))
+        (delimiter)))
     (line
       (word))))
 
@@ -83,7 +84,8 @@ Below
     (line
       (column_heading
         (heading
-          (word)))))
+          (word))
+        (delimiter))))
   (block
     (line
       (word))))
@@ -127,7 +129,8 @@ nvim_ui_try_resize({width}, {height})                   *nvim_ui_try_resize()*
         (heading
           (word))
         (heading
-          (word)))))
+          (word))
+        (delimiter))))
   (block
     (line
       (word)
@@ -147,7 +150,8 @@ nvim_ui_try_resize({width}, {height})                   *nvim_ui_try_resize()*
     (line
       (column_heading
         (heading
-          (word))))
+          (word))
+        (delimiter)))
     (line
       (taglink
         (word))
@@ -181,7 +185,8 @@ column_heading should NOT parse atoms (links, tags, etc.) (FIXME)
         (heading
           (word)
           (optionlink
-            (word))))))
+            (word)))
+        (delimiter))))
   (block
     (line
       (word))))