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

diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index 6b06153f3..38896cbfc 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -3,14 +3,14 @@
 [
   (calling_convention)
   (tag)
-] @preproc
+] @keyword.directive
 
 ; Includes
 
 [
   "import"
   "package"
-] @include
+] @keyword.import
 
 ; Keywords
 
@@ -41,7 +41,7 @@
 [
   "distinct"
   "dynamic"
-] @storageclass
+] @keyword.storage
 
 ; Conditionals
 
@@ -54,7 +54,7 @@
   "where"
   "break"
   (fallthrough_statement)
-] @conditional
+] @keyword.conditional
 
 ((ternary_expression
   [
@@ -63,7 +63,7 @@
     "if"
     "else"
     "when"
-  ] @conditional.ternary)
+  ] @keyword.conditional.ternary)
   (#set! "priority" 105))
 
 ; Repeats
@@ -72,7 +72,7 @@
   "for"
   "do"
   "continue"
-] @repeat
+] @keyword.repeat
 
 ; Variables
 
@@ -80,23 +80,23 @@
 
 ; Namespaces
 
-(package_declaration (identifier) @namespace)
+(package_declaration (identifier) @module)
 
-(import_declaration alias: (identifier) @namespace)
+(import_declaration alias: (identifier) @module)
 
-(foreign_block (identifier) @namespace)
+(foreign_block (identifier) @module)
 
-(using_statement (identifier) @namespace)
+(using_statement (identifier) @module)
 
 ; Parameters
 
-(parameter (identifier) @parameter ":" "="? (identifier)? @constant)
+(parameter (identifier) @variable.parameter ":" "="? (identifier)? @constant)
 
-(default_parameter (identifier) @parameter ":=")
+(default_parameter (identifier) @variable.parameter ":=")
 
-(named_type (identifier) @parameter)
+(named_type (identifier) @variable.parameter)
 
-(call_expression argument: (identifier) @parameter "=")
+(call_expression argument: (identifier) @variable.parameter "=")
 
 ; Functions
 
@@ -138,7 +138,7 @@
 
 (struct . (identifier) @type)
 
-(field_type . (identifier) @namespace "." (identifier) @type)
+(field_type . (identifier) @module "." (identifier) @type)
 
 (bit_set_type (identifier) @type ";")
 
@@ -152,13 +152,13 @@
 
 ; Fields
 
-(member_expression "." (identifier) @field)
+(member_expression "." (identifier) @variable.member)
 
-(struct_type "{" (identifier) @field)
+(struct_type "{" (identifier) @variable.member)
 
-(struct_field (identifier) @field "="?)
+(struct_field (identifier) @variable.member "="?)
 
-(field (identifier) @field)
+(field (identifier) @variable.member)
 
 ; Constants
 
@@ -187,7 +187,7 @@
 
 (number) @number
 
-(float) @float
+(float) @number.float
 
 (string) @string