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"
  (3f44b89685/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`
This commit is contained in:
Christian Clason 2023-12-24 10:00:20 +01:00
parent 10dd49958c
commit 1ae9b0e455
263 changed files with 2356 additions and 2337 deletions

View file

@ -21,7 +21,7 @@
(normal_command (identifier) @function)
["ENV" "CACHE"] @storageclass
["ENV" "CACHE"] @keyword.storage
["$" "{" "}" "<" ">"] @punctuation.special
["(" ")"] @punctuation.bracket
@ -37,18 +37,18 @@
(elseif)
(else)
(endif)
] @conditional
] @keyword.conditional
[
(foreach)
(endforeach)
(while)
(endwhile)
] @repeat
] @keyword.repeat
(normal_command
(identifier) @repeat
(#match? @repeat "\\c^(continue|break)$")
(identifier) @keyword.repeat
(#match? @keyword.repeat "\\c^(continue|break)$")
)
(normal_command
(identifier) @keyword.return
@ -59,7 +59,7 @@
(function)
(argument_list
. (argument) @function
(argument)* @parameter
(argument)* @variable.parameter
)
)
@ -67,7 +67,7 @@
(macro)
(argument_list
. (argument) @function.macro
(argument)* @parameter
(argument)* @variable.parameter
)
)
@ -134,7 +134,7 @@
(argument_list
. (argument)
(
(argument) @_cache @storageclass
(argument) @_cache @keyword.storage
.
(argument) @_type @type
(#any-of? @_cache "CACHE")
@ -148,8 +148,8 @@
(#match? @_function "\\c^unset$")
(argument_list
. (argument)
(argument) @storageclass
(#any-of? @storageclass "CACHE" "PARENT_SCOPE")
(argument) @keyword.storage
(#any-of? @keyword.storage "CACHE" "PARENT_SCOPE")
)
)
@ -213,5 +213,5 @@
(escape_sequence) @string.escape
((source_file . (line_comment) @preproc)
(#lua-match? @preproc "^#!/"))
((source_file . (line_comment) @keyword.directive)
(#lua-match? @keyword.directive "^#!/"))