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

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 664421701..b6fd64668 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -86,25 +86,25 @@
 (generator_function_declaration
   name: (identifier) @function)
 (method_definition
-  name: [(property_identifier) (private_property_identifier)] @method)
+  name: [(property_identifier) (private_property_identifier)] @function.method)
 (method_definition
   name: (property_identifier) @constructor
   (#eq? @constructor "constructor"))
 
 (pair
-  key: (property_identifier) @method
+  key: (property_identifier) @function.method
   value: (function))
 (pair
-  key: (property_identifier) @method
+  key: (property_identifier) @function.method
   value: (arrow_function))
 
 (assignment_expression
   left: (member_expression
-    property: (property_identifier) @method)
+    property: (property_identifier) @function.method)
   right: (arrow_function))
 (assignment_expression
   left: (member_expression
-    property: (property_identifier) @method)
+    property: (property_identifier) @function.method)
   right: (function))
 
 (variable_declarator
@@ -129,13 +129,13 @@
 
 (call_expression
   function: (member_expression
-    property: [(property_identifier) (private_property_identifier)] @method.call))
+    property: [(property_identifier) (private_property_identifier)] @function.method.call))
 
 ; Builtins
 ;---------
 
-((identifier) @namespace.builtin
- (#eq? @namespace.builtin "Intl"))
+((identifier) @module.builtin
+ (#eq? @module.builtin "Intl"))
 
 ((identifier) @function.builtin
  (#any-of? @function.builtin
@@ -159,7 +159,7 @@
 ; Variables
 ;----------
 (namespace_import
-  (identifier) @namespace)
+  (identifier) @module)
 
 ; Decorators
 ;----------
@@ -192,15 +192,15 @@
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
-(hash_bang_line) @preproc
+(hash_bang_line) @keyword.directive
 
-((string_fragment) @preproc
- (#eq? @preproc "use strict"))
+((string_fragment) @keyword.directive
+ (#eq? @keyword.directive "use strict"))
 
 (string) @string
 (template_string) @string
 (escape_sequence) @string.escape
-(regex_pattern) @string.regex
+(regex_pattern) @string.regexp
 (regex_flags) @character.special
 (regex "/" @punctuation.bracket) ; Regex delimiters
 
@@ -266,7 +266,7 @@
 ] @operator
 
 (binary_expression "/" @operator)
-(ternary_expression ["?" ":"] @conditional.ternary)
+(ternary_expression ["?" ":"] @keyword.conditional.ternary)
 (unary_expression ["!" "~" "-" "+"] @operator)
 (unary_expression ["delete" "void"] @keyword.operator)
 
@@ -289,17 +289,17 @@
   "else"
   "switch"
   "case"
-] @conditional
+] @keyword.conditional
 
 [
   "import"
   "from"
-] @include
+] @keyword.import
 
-(export_specifier "as" @include)
-(import_specifier "as" @include)
-(namespace_export "as" @include)
-(namespace_import "as" @include)
+(export_specifier "as" @keyword.import)
+(import_specifier "as" @keyword.import)
+(namespace_export "as" @keyword.import)
+(namespace_import "as" @keyword.import)
 
 [
   "for"
@@ -307,7 +307,7 @@
   "do"
   "while"
   "continue"
-] @repeat
+] @keyword.repeat
 
 [
   "break"
@@ -352,9 +352,9 @@
   "try"
   "catch"
   "finally"
-] @exception
+] @keyword.exception
 
 (export_statement
   "default" @keyword)
 (switch_default
-  "default" @conditional)
+  "default" @keyword.conditional)