fixup: column_heading

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

Hide file tree

Showing 4 changed files with 3,524 additions and 3,664 deletions.
diff --git a/grammar.js b/grammar.js
@@ -16,6 +16,11 @@ const _li_token = /[-•][ ]+/;
 module.exports = grammar({
   name: 'vimdoc',
 
+  conflicts: $ => [
+    [$._line_noli, $._column_heading],
+    [$._column_heading],
+  ],
+
   extras: () => [/[\t ]/],
 
   // inline: ($) => [
@@ -177,10 +182,14 @@ module.exports = grammar({
     // Intended for table column names per `:help help-writing`.
     // TODO: children should be $.word (plaintext), not $.atom.
     column_heading: ($) => seq(
-      alias(seq(choice($._atom_noli, $._uppercase_words), repeat($._atom)), $.heading),
+      alias($._column_heading, $.heading),
       alias('~', $.delimiter),
-      token.immediate('\n'),
+      token.immediate(/\n/),
     ),
+    _column_heading: $ => prec.dynamic(1, seq(
+      choice($._atom_noli, $._uppercase_words),
+      repeat($._atom)
+    )),
 
     h1: ($) =>
       prec(1, seq(

diff --git a/src/grammar.json b/src/grammar.json