feat!: align standard captures with upstream

Problem: Sharing highlight queries with upstream tree-sitter and
Helix is difficult.

Solution: Where reasonable, use capture names in tree-sitter's standard
list or Helix's Atom-style hierarchy.

Specifically:

* tree-sitter "standard capture names"
  (https://github.com/tree-sitter/tree-sitter/blob/3f44b896852eb7daaa6df4fb778c9bb52c70c815/highlight/src/lib.rs#L20-L72):

  - `@parameter` -> `@variable.parameter`
  - `@field` -> `@variable.member`
  - `@namespace` -> `@module`
  - `@float` -> `@number.float`
  - `@symbol` -> `@string.special.symbol`
  - `@string.regex` -> `@string.regexp`
  - `@text.*` -> `@markup.*` (`strong`, `italic`, `link`, `strikethrough`; with exceptions; see below)
  - `@text.title` -> `@markup.heading`
  - `@text.literal` -> `@markup.raw`
  - `@text.reference` -> `@markup.link`
  - `@text.uri` -> `@markup.link.url` (in markup links)
  - `@string.special` -> `@markup.link.label` (non-url links)
  - `@punctuation.special` -> `@markup.list` (markdown lists only; move subitems from `@text.todo`)

* Helix captures
  (https://docs.helix-editor.com/master/themes.html#syntax-highlighting):

  - `@method` -> `@function.method`
  - `@method.call` -> `@function.method.call`
  - `@text.{todo,warning,note,danger}` -> `@comment.{error,warning,hint,info,todo}`
  - `@text.diff.{add,delete,}` -> `@diff.{plus,minus,delta}`
  - `@text.uri` -> `@string.special.url` (outside markup)
  - `@preproc` -> `@keyword.directive`
  - `@define` -> `@keyword.directive`(`.define`?)
  - `@storageclass` -> `@keyword.storage`
  - `@conditional` -> `@keyword.conditional`
  - `@debug` -> `@keyword.debug`
  - `@exception` -> `@keyword.exception`
  - `@include` -> `@keyword.import`
  - `@repeat` -> `@keyword.repeat`

* cleanup

  - remove some redundant `@conceal` (but still allow it for conceal-only patterns)
  - remove obsolete `@error` (syntax linting is out of scope for this repo)
  - sort, cleanup capture list in `CONTRIBUTING.md`

1 files changed, 22 insertions, 35 deletions

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index f9589bdd9..a1f63328b 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -1,49 +1,36 @@
 ;; From MDeiml/tree-sitter-markdown
-[
-  (code_span)
-  (link_title)
-] @text.literal @nospell
-
-[
-  (emphasis_delimiter)
-  (code_span_delimiter)
-] @punctuation.delimiter
+(code_span) @markup.raw @nospell
 
-(emphasis) @text.emphasis
+(emphasis) @markup.italic
 
-(strong_emphasis) @text.strong
+(strong_emphasis) @markup.strong
 
-(strikethrough) @text.strike
+(strikethrough) @markup.strikethrough
 
 [
   (link_destination)
   (uri_autolink)
-] @text.uri @nospell
+] @markup.link.url @nospell
 
 (shortcut_link (link_text) @nospell)
 
 [
   (link_label)
   (link_text)
+  (link_title)
   (image_description)
-] @text.reference
+] @markup.link.label
 
 [
   (backslash_escape)
   (hard_line_break)
 ] @string.escape
 
-(image "!" @punctuation.special)
-(image ["[" "]" "(" ")"] @punctuation.bracket)
-(inline_link ["[" "]" "(" ")"] @punctuation.bracket)
-(shortcut_link ["[" "]"] @punctuation.bracket)
-
 ; Conceal codeblock and text style markers
-([
-  (code_span_delimiter)
-  (emphasis_delimiter)
-] @conceal
-(#set! conceal ""))
+((code_span_delimiter) @markup.raw
+  (#set! conceal ""))
+((emphasis_delimiter) @markup.strong
+  (#set! conceal ""))
 
 ; Conceal inline links
 (inline_link
@@ -53,7 +40,7 @@
     "("
     (link_destination)
     ")"
-  ] @conceal
+  ] @markup.link
   (#set! conceal ""))
 
 ; Conceal image links
@@ -65,7 +52,7 @@
     "("
     (link_destination)
     ")"
-  ] @conceal
+  ] @markup.link
   (#set! conceal ""))
 
 ; Conceal full reference links
@@ -74,7 +61,7 @@
     "["
     "]"
     (link_label)
-  ] @conceal
+  ] @markup.link
   (#set! conceal ""))
 
 ; Conceal collapsed reference links
@@ -82,7 +69,7 @@
   [
     "["
     "]"
-  ] @conceal
+  ] @markup.link
   (#set! conceal ""))
 
 ; Conceal shortcut links
@@ -90,13 +77,13 @@
   [
     "["
     "]"
-  ] @conceal
+  ] @markup.link
   (#set! conceal ""))
 
 ;; Replace common HTML entities.
-((entity_reference) @conceal (#eq? @conceal " ") (#set! conceal ""))
-((entity_reference) @conceal (#eq? @conceal "&lt;") (#set! conceal "<"))
-((entity_reference) @conceal (#eq? @conceal "&gt;") (#set! conceal ">"))
-((entity_reference) @conceal (#eq? @conceal "&amp;") (#set! conceal "&"))
-((entity_reference) @conceal (#eq? @conceal "&quot;") (#set! conceal "\""))
-((entity_reference) @conceal (#any-of? @conceal "&ensp;" "&emsp;") (#set! conceal " "))
\ No newline at end of file
+((entity_reference) @character.special (#eq? @character.special "&nbsp;") (#set! conceal ""))
+((entity_reference) @character.special (#eq? @character.special "&lt;") (#set! conceal "<"))
+((entity_reference) @character.special (#eq? @character.special "&gt;") (#set! conceal ">"))
+((entity_reference) @character.special (#eq? @character.special "&amp;") (#set! conceal "&"))
+((entity_reference) @character.special (#eq? @character.special "&quot;") (#set! conceal "\""))
+((entity_reference) @character.special (#any-of? @character.special "&ensp;" "&emsp;") (#set! conceal " "))