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`

2 files changed, 13 insertions, 13 deletions

diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index 65c00ea27..9c6fe1be8 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -8,10 +8,10 @@
 (type_spec name: (type_identifier) @type.definition)
 (field_identifier) @property
 (identifier) @variable
-(package_identifier) @namespace
+(package_identifier) @module
 
-(parameter_declaration (identifier) @parameter)
-(variadic_parameter_declaration (identifier) @parameter)
+(parameter_declaration (identifier) @variable.parameter)
+(variadic_parameter_declaration (identifier) @variable.parameter)
 
 (label_name) @label
 
@@ -25,7 +25,7 @@
 
 (call_expression
   function: (selector_expression
-    field: (field_identifier) @method.call))
+    field: (field_identifier) @function.method.call))
 
 ; Function definitions
 
@@ -33,10 +33,10 @@
   name: (identifier) @function)
 
 (method_declaration
-  name: (field_identifier) @method)
+  name: (field_identifier) @function.method)
 
 (method_spec
-  name: (field_identifier) @method)
+  name: (field_identifier) @function.method)
 
 ; Constructors
 
@@ -112,19 +112,19 @@
 "return" @keyword.return
 "go" @keyword.coroutine
 
-"for" @repeat
+"for" @keyword.repeat
 
 [
   "import"
   "package"
-] @include
+] @keyword.import
 
 [
   "else"
   "case"
   "switch"
   "if"
- ] @conditional
+ ] @keyword.conditional
 
 
 ;; Builtin types
@@ -204,7 +204,7 @@
 (escape_sequence) @string.escape
 
 (int_literal) @number
-(float_literal) @float
+(float_literal) @number.float
 (imaginary_literal) @number
 
 [
@@ -218,8 +218,8 @@
 ] @constant.builtin
 
 (keyed_element
-  . (literal_element (identifier) @field))
-(field_declaration name: (field_identifier) @field)
+  . (literal_element (identifier) @variable.member))
+(field_declaration name: (field_identifier) @variable.member)
 
 ; Comments
 
diff --git a/queries/go/locals.scm b/queries/go/locals.scm
index 37d72b2be..5702a2b93 100644
--- a/queries/go/locals.scm
+++ b/queries/go/locals.scm
@@ -5,7 +5,7 @@
 
 (
     (method_declaration
-        name: (field_identifier) @local.definition.method); @method
+        name: (field_identifier) @local.definition.method); @function.method
 )
 
 (short_var_declaration