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, 8 insertions, 6 deletions

diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index b224a6765..e1d7aa4f7 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -7,8 +7,8 @@
   "ifneq"
   "ifdef"
   "ifndef"
- ] @conditional)
- "endif" @conditional)
+ ] @keyword.conditional)
+ "endif" @keyword.conditional)
 
 (rule (targets (word) @function))
 
@@ -41,10 +41,12 @@
 
 (export_directive "export" @keyword)
 (override_directive "override" @keyword)
-(include_directive ["include" "-include"] @include)
+(include_directive
+  ["include" "-include"] @keyword.import
+  filenames: (list (word) @string.special.path))
 
 (variable_assignment
- name: (word) @symbol
+ name: (word) @string.special.symbol
  [
   "?="
   ":="
@@ -55,12 +57,12 @@
  ] @operator)
 
 (shell_assignment
- name: (word) @symbol
+ name: (word) @string.special.symbol
  "!=" @operator)
 
 (define_directive
  "define" @keyword
- name: (word) @symbol
+ name: (word) @string.special.symbol
  [
   "="
   ":="