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`

3 files changed, 19 insertions, 19 deletions

diff --git a/tests/query/highlights/gleam/assert.gleam b/tests/query/highlights/gleam/assert.gleam
index d36716a3f..8be39923d 100644
--- a/tests/query/highlights/gleam/assert.gleam
+++ b/tests/query/highlights/gleam/assert.gleam
@@ -1,6 +1,6 @@
 pub fn main() {
   assert Ok(i) = parse_int("123")
-  // <- @exception
+  // <- @keyword.exception
   //     ^^ @constructor
   //       ^ @punctuation.bracket
   //        ^ @variable
diff --git a/tests/query/highlights/gleam/function.gleam b/tests/query/highlights/gleam/function.gleam
index aed4879dc..ff2b690ca 100644
--- a/tests/query/highlights/gleam/function.gleam
+++ b/tests/query/highlights/gleam/function.gleam
@@ -3,11 +3,11 @@ pub fn add(x: Int, y: Int) -> Int {
 //  ^^ @keyword.function
 //     ^^^ @function
 //        ^ @punctuation.bracket
-//         ^ @parameter
+//         ^ @variable.parameter
 //          ^ @punctuation.delimiter
 //            ^^^ @type.builtin
 //               ^ @punctuation.delimiter
-//                 ^ @parameter
+//                 ^ @variable.parameter
 //                  ^ @punctuation.delimiter
 //                    ^^^ @type.builtin
 //                       ^ @punctuation.bracket
@@ -22,7 +22,7 @@ pub fn twice(f: fn(t) -> t, x: t) -> t {
 //  ^ @keyword.function
 //     ^^^^^ @function
 //          ^ @punctuation.bracket
-//           ^ @parameter
+//           ^ @variable.parameter
 //            ^ @punctuation.delimiter
 //              ^^ @keyword.function
 //                ^ @punctuation.bracket
@@ -31,7 +31,7 @@ pub fn twice(f: fn(t) -> t, x: t) -> t {
 //                    ^^ @punctuation.delimiter
 //                       ^ @type
 //                        ^ @punctuation.delimiter
-//                          ^ @parameter
+//                          ^ @variable.parameter
 //                           ^ @punctuation.delimiter
 //                             ^ @type
 //                              ^ @punctuation.bracket
@@ -45,7 +45,7 @@ fn list_of_two(my_value: a) -> List(a) {
 // <- @keyword.function
 // ^ @function
 //            ^ @punctuation.bracket
-//             ^ @parameter
+//             ^ @variable.parameter
 //                     ^ @punctuation.delimiter
 //                       ^ @type
 //                        ^ @punctuation.bracket
@@ -64,19 +64,19 @@ fn replace(
 //        ^ @punctuation.bracket
   in string: String,
   // <- @label
-  // ^^^^^^ @parameter
+  // ^^^^^^ @variable.parameter
   //       ^ @punctuation.delimiter
   //         ^^^^^^ @type.builtin
   //               ^ @punctuation.delimiter
   each pattern: String,
   // <- @label
-  //   ^^^^^^^ @parameter
+  //   ^^^^^^^ @variable.parameter
   //          ^ @punctuation.delimiter
   //            ^^^^^^ @type.builtin
   //                  ^ @punctuation.delimiter
   with replacement: String,
   // <- @label
-  //   ^^^^^^^^^^^ @parameter
+  //   ^^^^^^^^^^^ @variable.parameter
   //              ^ @punctuation.delimiter
   //                ^^^^^^ @type.builtin
   //                      ^ @punctuation.delimiter
@@ -109,7 +109,7 @@ pub external fn random_float() -> Float = "rand" "uniform"
 //                             ^^ @punctuation.delimiter
 //                                ^^^^^ @type.builtin
 //                                      ^ @operator
-//                                        ^^^^^^ @namespace
+//                                        ^^^^^^ @module
 //                                               ^^^^^^^^^ @function
 
 pub external fn inspect(a) -> a = "Elixir.IO" "inspect"
@@ -123,5 +123,5 @@ pub external fn inspect(a) -> a = "Elixir.IO" "inspect"
 //                         ^^ @punctuation.delimiter
 //                            ^ @type
 //                              ^ @operator
-//                                ^^^^^^^^^^^ @namespace
+//                                ^^^^^^^^^^^ @module
 //                                            ^^^^^^^^^ @function
diff --git a/tests/query/highlights/gleam/import.gleam b/tests/query/highlights/gleam/import.gleam
index 3ee141513..ac452d157 100644
--- a/tests/query/highlights/gleam/import.gleam
+++ b/tests/query/highlights/gleam/import.gleam
@@ -1,18 +1,18 @@
 import gleam/io
-// <- @include
-//     ^ @namespace
+// <- @keyword.import
+//     ^ @module
 //          ^ @operator
-//           ^ @namespace
+//           ^ @module
 
 import cat as kitten
-// <- @include
-//     ^ @namespace
+// <- @keyword.import
+//     ^ @module
 //         ^ @keyword
-//            ^ @namespace
+//            ^ @module
 
 import animal/cat.{Cat, stroke}
-// <- @include
-//     ^ @namespace
+// <- @keyword.import
+//     ^ @module
 //           ^ @operator
 //               ^ @punctuation.delimiter
 //                ^ @punctuation.bracket