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

diff --git a/queries/uxntal/highlights.scm b/queries/uxntal/highlights.scm
index 795c73d09..ce81e77ef 100644
--- a/queries/uxntal/highlights.scm
+++ b/queries/uxntal/highlights.scm
@@ -1,8 +1,8 @@
 ; Includes
 
 (include
-  "~" @include
-  _ @text.uri @string.special)
+  "~" @keyword.import
+  _ @string.special.url)
 
 ; Variables
 
@@ -35,25 +35,25 @@
 ; Labels
 
 (label
-  "@" @symbol
+  "@" @string.special.symbol
   (identifier) @function)
 
 (sublabel_reference
-  (identifier) @namespace
+  (identifier) @module
   "/" @punctuation.delimiter
   (identifier) @label)
 
 ; Repeats
 
-((identifier) @repeat
-  (#eq? @repeat "while"))
+((identifier) @keyword.repeat
+  (#eq? @keyword.repeat "while"))
 
 ; Literals
 
 (raw_ascii) @string
 
 (hex_literal
-  "#" @symbol
+  "#" @string.special.symbol
   (hex_lit_value) @string.special)
 
 (number) @number