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, 9 insertions, 9 deletions

diff --git a/queries/tablegen/highlights.scm b/queries/tablegen/highlights.scm
index c541cd165..aea94b4eb 100644
--- a/queries/tablegen/highlights.scm
+++ b/queries/tablegen/highlights.scm
@@ -1,10 +1,10 @@
 ; Preprocs
 
-(preprocessor_directive) @preproc
+(preprocessor_directive) @keyword.directive
 
 ; Includes
 
-"include" @include
+"include" @keyword.import
 
 ; Keywords
 
@@ -30,13 +30,13 @@
   "if"
   "else"
   "then"
-] @conditional
+] @keyword.conditional
 
 ; Repeats
 
 [
   "foreach"
-] @repeat
+] @keyword.repeat
 
 ; Variables
 
@@ -46,7 +46,7 @@
 
 ; Parameters
 
-(template_arg (identifier) @parameter)
+(template_arg (identifier) @variable.parameter)
 
 
 ; Types
@@ -85,10 +85,10 @@
 ; Fields
 
 (instruction
-  (identifier) @field)
+  (identifier) @variable.member)
 
 (let_instruction
-  (identifier) @field)
+  (identifier) @variable.member)
 
 ; Functions
 
@@ -148,5 +148,5 @@
 ] @comment @spell
 
 
-((comment) @preproc
-  (#lua-match? @preproc "^.*RUN"))
+((comment) @keyword.directive
+  (#lua-match? @keyword.directive "^.*RUN"))