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

diff --git a/queries/pug/highlights.scm b/queries/pug/highlights.scm
index 57667885a..cdd9d1d83 100644
--- a/queries/pug/highlights.scm
+++ b/queries/pug/highlights.scm
@@ -18,7 +18,7 @@
 (id) @constant
 (class) @property
 
-(doctype) @preproc
+(doctype) @keyword.directive
 
 (content) @none
 
@@ -33,22 +33,22 @@
  (#match? @keyword "^(:|v-bind|v-|\\@)"))
 (quoted_attribute_value) @string
 
-(include (keyword) @include)
-(extends (keyword) @include)
-(filename) @string.special
+(include (keyword) @keyword.import)
+(extends (keyword) @keyword.import)
+(filename) @string.special.path
 
 (block_definition (keyword) @keyword)
 (block_append (keyword)+ @keyword)
 (block_prepend (keyword)+ @keyword)
 (block_name) @type
 
-(conditional (keyword) @conditional)
+(conditional (keyword) @keyword.conditional)
 (case
-  (keyword) @conditional
-  (when (keyword) @conditional)+)
+  (keyword) @keyword.conditional
+  (when (keyword) @keyword.conditional)+)
 
-(each (keyword) @repeat)
-(while (keyword) @repeat)
+(each (keyword) @keyword.repeat)
+(while (keyword) @keyword.repeat)
 
 (mixin_use
   "+" @punctuation.delimiter
@@ -57,14 +57,14 @@
   (keyword) @keyword.function
   (mixin_name) @function)
 (mixin_attributes
-  (attribute_name) @parameter)
+  (attribute_name) @variable.parameter)
 
 (filter
   ":" @punctuation.delimiter
-  (filter_name) @method.call)
+  (filter_name) @function.method.call)
 (filter
   (attributes
-    (attribute (attribute_name) @parameter)))
+    (attribute (attribute_name) @variable.parameter)))
 
 [
  "(" ")"