Merge #53 feat(codeblock): conceal ">", "<" delimiters

Author: justinmk

binding.gyp

@@ -0,0 +1,19 @@
+{
+  "targets": [
+    {
+      "target_name": "tree_sitter_help_binding",
+      "include_dirs": [
+        "<!(node -e \"require('nan')\")",
+        "src"
+      ],
+      "sources": [
+        "bindings/node/binding.cc",
+        "src/parser.c",
+        # If your language uses an external scanner, add it here.
+      ],
+      "cflags_c": [
+        "-std=c99",
+      ]
+    }
+  ]
+}

corpus/arguments.txt

@@ -151,4 +151,4 @@ EXTERNAL *netrw-externapp* {{{2
         (uppercase_name)
         (tag
           (word))
-        (ERROR)))))
+        (word)))))

corpus/codeblock.txt

@@ -352,3 +352,30 @@ codeblock stop and start on same line
       (codeblock
         (line)
         (line)))))
+
+================================================================================
+NOT codeblock: whitespace after ">"
+================================================================================
+x > 
+  line
+
+x x> 
+  line
+
+
+
+--------------------------------------------------------------------------------
+
+(help_file
+  (block
+    (line
+      (word)
+      (word))
+    (line
+      (word)))
+  (block
+    (line
+      (word)
+      (word))
+    (line
+      (word))))

grammar.js

@@ -82,6 +82,8 @@ module.exports = grammar({
       '(',
       /\w+\(/,
       '~',
+      // NOT codeblock: random ">" in middle of the motherflippin text.
+      '>',
     ),
 
     keycode: () => choice(
@@ -121,7 +123,8 @@ module.exports = grammar({
 
     // Codeblock: preformatted block of lines starting with ">".
     codeblock: ($) => prec.right(seq(
-      />[\t ]*\n/,
+      '>',
+      token.immediate('\n'),
       repeat1(alias($.line_code, $.line)),
       // Codeblock ends if a line starts with non-whitespace.
       // Terminating "<" is consumed in other rules.
@@ -182,7 +185,7 @@ module.exports = grammar({
     h3: ($) =>
       seq(
         field('name', $.uppercase_name),
-        repeat($.tag),
+        optional(seq($.tag, repeat($._atom))),
         '\n',
       ),
 

queries/help/highlights.scm

@@ -14,6 +14,10 @@
    "`" @conceal (#set! conceal "")
    text: (_) @text.literal)
 (codeblock) @text.literal
+(codeblock
+   ">" @conceal (#set! conceal ""))
+(block
+   "<" @conceal (#set! conceal ""))
 (argument) @parameter
 (keycode) @string.special
 (url) @text.uri

src/grammar.json

@@ -280,6 +280,10 @@
         {
           "type": "STRING",
           "value": "~"
+        },
+        {
+          "type": "STRING",
+          "value": ">"
         }
       ]
     },
@@ -445,8 +449,15 @@
         "type": "SEQ",
         "members": [
           {
-            "type": "PATTERN",
-            "value": ">[\\t ]*\\n"
+            "type": "STRING",
+            "value": ">"
+          },
+          {
+            "type": "IMMEDIATE_TOKEN",
+            "content": {
+              "type": "STRING",
+              "value": "\n"
+            }
           },
           {
             "type": "REPEAT1",
@@ -742,11 +753,28 @@
           }
         },
         {
-          "type": "REPEAT",
-          "content": {
-            "type": "SYMBOL",
-            "name": "tag"
-          }
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "tag"
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "_atom"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         },
         {
           "type": "STRING",

src/node-types.json

@@ -225,9 +225,37 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "argument",
+          "named": true
+        },
+        {
+          "type": "codespan",
+          "named": true
+        },
+        {
+          "type": "keycode",
+          "named": true
+        },
+        {
+          "type": "optionlink",
+          "named": true
+        },
         {
           "type": "tag",
           "named": true
+        },
+        {
+          "type": "taglink",
+          "named": true
+        },
+        {
+          "type": "url",
+          "named": true
+        },
+        {
+          "type": "word",
+          "named": true
         }
       ]
     }
@@ -439,6 +467,10 @@
     "type": "<",
     "named": false
   },
+  {
+    "type": ">",
+    "named": false
+  },
   {
     "type": "`",
     "named": false