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

diff --git a/tests/query/highlights/cpp/concepts.cpp b/tests/query/highlights/cpp/concepts.cpp
index 6fe6af436..09d975c98 100644
--- a/tests/query/highlights/cpp/concepts.cpp
+++ b/tests/query/highlights/cpp/concepts.cpp
@@ -7,7 +7,7 @@ concept Derived = std::is_base_of<U, T>::value;
 template<typename T>
 concept Hashable = requires(T a) {
 //                   ^ @keyword
-//                            ^ @parameter
+//                            ^ @variable.parameter
 //                          ^ @type
     { std::hash<T>{}(a) } -> std::convertible_to<std::size_t>;
  typename CommonType<T, U>; // CommonType<T, U> is valid and names a type
diff --git a/tests/query/highlights/cpp/enums-as-constants.cpp b/tests/query/highlights/cpp/enums-as-constants.cpp
index ae773e8d3..d6b93d5ec 100644
--- a/tests/query/highlights/cpp/enums-as-constants.cpp
+++ b/tests/query/highlights/cpp/enums-as-constants.cpp
@@ -11,7 +11,7 @@ void foo(Foo f){
     switch ( f ) {
         case Foo::a:
          //  ^ @type
-         //   ^ @namespace
+         //   ^ @module
          //       ^ @constant
             break;
         case Foo::aa:
diff --git a/tests/query/highlights/cpp/test.cpp b/tests/query/highlights/cpp/test.cpp
index 3f903a55f..4a4c6238a 100644
--- a/tests/query/highlights/cpp/test.cpp
+++ b/tests/query/highlights/cpp/test.cpp
@@ -1,11 +1,11 @@
 #include <iostream>
 #include <cstdlib>
-//    ^ @include
+//    ^ @keyword.import
 //       ^ @string
 
 auto main( int argc, char** argv ) -> int
 // ^ @type.builtin
-      //       ^ @parameter
+      //       ^ @variable.parameter
       //    ^ @type.builtin
       //    ^ @type.builtin
       //                  ^ @operator