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

diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 55c0c8fc2..4c6501de6 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -10,14 +10,14 @@
 (defun_header
   function_name: (_) @function)
 (defun_header
-  lambda_list: (list_lit (sym_lit) @parameter))
+  lambda_list: (list_lit (sym_lit) @variable.parameter))
 (defun_header
   keyword: (defun_keyword "defmethod")
-  lambda_list: (list_lit (list_lit . (sym_lit) . (sym_lit) @symbol)))
+  lambda_list: (list_lit (list_lit . (sym_lit) . (sym_lit) @string.special.symbol)))
 (defun_header
-  lambda_list: (list_lit (list_lit . (sym_lit) @parameter . (_))))
+  lambda_list: (list_lit (list_lit . (sym_lit) @variable.parameter . (_))))
 (defun_header
-  specifier: (sym_lit) @symbol)
+  specifier: (sym_lit) @string.special.symbol)
 
 [":" "::" "."] @punctuation.special
 
@@ -51,14 +51,14 @@
 ] @function.macro
 "=" @operator
 
-(include_reader_macro) @symbol
+(include_reader_macro) @string.special.symbol
 ["#C" "#c"] @number
 
-[(kwd_lit) (self_referential_reader_macro)] @symbol
+[(kwd_lit) (self_referential_reader_macro)] @string.special.symbol
 
 (package_lit
-  package: (_) @namespace)
-"cl" @namespace
+  package: (_) @module)
+"cl" @module
 
 (str_lit) @string
 
@@ -119,10 +119,10 @@
  (#lua-match? @constant "^[+].+[+]$"))
 
 (var_quoting_lit
-  marker: "#'" @symbol
-  value: (_) @symbol)
+  marker: "#'" @string.special.symbol
+  value: (_) @string.special.symbol)
 
-["#" "#p" "#P"] @symbol
+["#" "#p" "#P"] @string.special.symbol
 
 (list_lit
   .
@@ -137,8 +137,8 @@
  (#match? @operator "^([+*-+=<>]|<=|>=|/=)$"))
 
 
-((sym_lit) @symbol
-(#lua-match? @symbol "^[&]"))
+((sym_lit) @string.special.symbol
+(#lua-match? @string.special.symbol "^[&]"))
 
 [(array_dimension) "#0A" "#0a"] @number