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/objc/highlights.scm b/queries/objc/highlights.scm
index c636895f6..129a74e89 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -3,15 +3,15 @@
 ; Preprocs
 
 (preproc_undef
-  name: (_) @constant) @preproc
+  name: (_) @constant) @keyword.directive
 
 ; Includes
 
-(module_import "@import" @include path: (identifier) @namespace)
+(module_import "@import" @keyword.import path: (identifier) @module)
 
 ((preproc_include
-  _ @include path: (_))
-  (#any-of? @include "#include" "#import"))
+  _ @keyword.import path: (_))
+  (#any-of? @keyword.import "#include" "#import"))
 
 ; Type Qualifiers
 
@@ -31,7 +31,7 @@
   "@dynamic"
   "volatile"
   (protocol_qualifier)
-] @storageclass
+] @keyword.storage
 
 ; Keywords
 
@@ -74,7 +74,7 @@
   "@finally"
   "__finally"
   "@throw"
-] @exception
+] @keyword.exception
 
 ; Variables
 
@@ -91,13 +91,13 @@
   "asm"
 ] @function.builtin
 
-(method_definition (identifier) @method)
+(method_definition (identifier) @function.method)
 
-(method_declaration (identifier) @method)
+(method_declaration (identifier) @function.method)
 
-(method_identifier (identifier)? @method ":" @method (identifier)? @method)
+(method_identifier (identifier)? @function.method ":" @function.method (identifier)? @function.method)
 
-(message_expression method: (identifier) @method.call)
+(message_expression method: (identifier) @function.method.call)
 
 ; Constructors
 
@@ -154,9 +154,9 @@
 
 (class_declaration (identifier) @type)
 
-(class_interface "@interface" . (identifier) @type superclass: _? @type category: _? @namespace)
+(class_interface "@interface" . (identifier) @type superclass: _? @type category: _? @module)
 
-(class_implementation "@implementation" . (identifier) @type superclass: _? @type category: _? @namespace)
+(class_implementation "@implementation" . (identifier) @type superclass: _? @type category: _? @module)
 
 (protocol_forward_declaration (identifier) @type) ; @interface :(
 
@@ -185,17 +185,17 @@
 
 ; Parameters
 
-(method_parameter ":" @method (identifier) @parameter)
+(method_parameter ":" @function.method (identifier) @variable.parameter)
 
-(method_parameter declarator: (identifier) @parameter)
+(method_parameter declarator: (identifier) @variable.parameter)
 
 (parameter_declaration 
   declarator: (function_declarator 
                 declarator: (parenthesized_declarator 
                               (block_pointer_declarator 
-                                declarator: (identifier) @parameter))))
+                                declarator: (identifier) @variable.parameter))))
 
-"..." @parameter.builtin
+"..." @variable.parameter.builtin
 
 ; Operators
 
@@ -207,7 +207,7 @@
 
 (platform) @string.special
 
-(version_number) @text.uri @number
+(version_number) @string.special
 
 ; Punctuation