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`
2023-12-24 10:00:20 +01:00
|
|
|
; Surface text is not highlighted
|
|
|
|
|
(text) @none
|
2021-08-01 13:09:41 -06:00
|
|
|
|
|
|
|
|
; Surface has two types of comments, both are highlighted as such
|
2023-09-13 00:25:01 +09:00
|
|
|
(comment) @comment @spell
|
2021-08-01 13:09:41 -06:00
|
|
|
|
|
|
|
|
; Surface attributes are highlighted as HTML attributes
|
|
|
|
|
(attribute_name) @tag.attribute
|
|
|
|
|
|
|
|
|
|
; Attributes are highlighted as strings
|
2021-08-15 10:42:10 -07:00
|
|
|
(quoted_attribute_value) @string
|
2021-08-01 13:09:41 -06:00
|
|
|
|
|
|
|
|
; Surface blocks are highlighted as keywords
|
|
|
|
|
[
|
2024-01-06 15:05:50 +09:00
|
|
|
(start_block)
|
2021-08-01 13:09:41 -06:00
|
|
|
(end_block)
|
|
|
|
|
(subblock)
|
|
|
|
|
] @keyword
|
|
|
|
|
|
|
|
|
|
; Surface supports HTML tags and are highlighted as such
|
|
|
|
|
[
|
2021-08-15 09:40:02 -07:00
|
|
|
"<"
|
|
|
|
|
">"
|
|
|
|
|
"</"
|
|
|
|
|
"/>"
|
|
|
|
|
"{"
|
|
|
|
|
"}"
|
2021-08-15 10:42:10 -07:00
|
|
|
"<!--"
|
|
|
|
|
"-->"
|
|
|
|
|
"{!--"
|
|
|
|
|
"--}"
|
2021-08-01 13:09:41 -06:00
|
|
|
] @tag.delimiter
|
|
|
|
|
|
|
|
|
|
; Surface tags are highlighted as HTML
|
|
|
|
|
(tag_name) @tag
|
|
|
|
|
|
|
|
|
|
; Surface components are highlighted as types (Elixir modules)
|
|
|
|
|
(component_name) @type
|
|
|
|
|
|
|
|
|
|
; Surface directives are highlighted as keywords
|
|
|
|
|
(directive_name) @keyword
|
|
|
|
|
|
|
|
|
|
; Surface operators
|
2024-01-06 15:05:50 +09:00
|
|
|
"=" @operator
|