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

diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 74656e336..33c30f095 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -1,4 +1,4 @@
-; Lower priority to prefer @parameter when identifier appears in parameter_declaration.
+; Lower priority to prefer @variable.parameter when identifier appears in parameter_declaration.
 ((identifier) @variable (#set! "priority" 95))
 (preproc_def (preproc_arg) @variable)
 
@@ -27,14 +27,14 @@
   "do"
   "continue"
   "break"
-] @repeat
+] @keyword.repeat
 
 [
  "if"
  "else"
  "case"
  "switch"
-] @conditional
+] @keyword.conditional
 
 [
   "#if"
@@ -46,11 +46,11 @@
   "#elifdef"
   "#elifndef"
   (preproc_directive)
-] @preproc
+] @keyword.directive
 
-"#define" @define
+"#define" @keyword.directive.define
 
-"#include" @include
+"#include" @keyword.import
 
 [ ";" ":" "," "::" ] @punctuation.delimiter
 
@@ -111,7 +111,7 @@
   (false)
 ] @boolean
 
-(conditional_expression [ "?" ":" ] @conditional.ternary)
+(conditional_expression [ "?" ":" ] @keyword.conditional.ternary)
 
 (string_literal) @string
 (system_lib_string) @string
@@ -140,7 +140,7 @@
  (type_descriptor)
 ] @type
 
-(storage_class_specifier) @storageclass
+(storage_class_specifier) @keyword.storage
 
 [
   (type_qualifier)
@@ -149,7 +149,7 @@
 ] @type.qualifier
 
 (linkage_specification
-  "extern" @storageclass)
+  "extern" @keyword.storage)
 
 (type_definition
   declarator: (type_identifier) @type.definition)
@@ -236,13 +236,13 @@
 
 ;; Parameters
 (parameter_declaration
-  declarator: (identifier) @parameter)
+  declarator: (identifier) @variable.parameter)
 
 (parameter_declaration
-  declarator: (array_declarator) @parameter)
+  declarator: (array_declarator) @variable.parameter)
 
 (parameter_declaration
-  declarator: (pointer_declarator) @parameter)
+  declarator: (pointer_declarator) @variable.parameter)
 
 ; K&R functions
 ; To enable support for K&R functions,
@@ -250,24 +250,24 @@
 ; They are commented out as they'll conflict with C++
 ; Note that you'll need to have `; extends` at the top of your query file.
 ;
-; (parameter_list (identifier) @parameter)
+; (parameter_list (identifier) @variable.parameter)
 ;
 ; (function_definition
 ;   declarator: _
 ;   (declaration
-;     declarator: (identifier) @parameter))
+;     declarator: (identifier) @variable.parameter))
 ;
 ; (function_definition
 ;   declarator: _
 ;   (declaration
-;     declarator: (array_declarator) @parameter))
+;     declarator: (array_declarator) @variable.parameter))
 ;
 ; (function_definition
 ;   declarator: _
 ;   (declaration
-;     declarator: (pointer_declarator) @parameter))
+;     declarator: (pointer_declarator) @variable.parameter))
 
-(preproc_params (identifier) @parameter)
+(preproc_params (identifier) @variable.parameter)
 
 [
   "__attribute__"