mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-01 19:17:02 -04:00
1ae9b0e455
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`
60 lines
821 B
Scheme
60 lines
821 B
Scheme
[
|
|
"enum"
|
|
"extern"
|
|
"grammar"
|
|
"match"
|
|
"type"
|
|
"pub"
|
|
] @keyword
|
|
|
|
[
|
|
"match"
|
|
"else"
|
|
] @keyword.conditional
|
|
|
|
[
|
|
"+"
|
|
"*"
|
|
"?"
|
|
; TODO: inaccessible node
|
|
; =>
|
|
"=>@L"
|
|
"=>@R"
|
|
] @operator
|
|
|
|
(grammar_type_params
|
|
["<" ">"] @punctuation.bracket)
|
|
|
|
(symbol
|
|
["<" ">"] @punctuation.bracket)
|
|
|
|
(binding_symbol
|
|
["<" ">"] @punctuation.bracket)
|
|
|
|
(binding_symbol
|
|
name: (identifier) @variable.parameter)
|
|
|
|
(bare_symbol
|
|
(macro
|
|
((macro_id) @type.definition)))
|
|
|
|
(bare_symbol
|
|
(identifier) @type.definition)
|
|
|
|
(nonterminal_name
|
|
(macro_id) @type.definition)
|
|
|
|
(nonterminal_name
|
|
(identifier) @type.definition)
|
|
|
|
(nonterminal
|
|
(type_ref) @type.builtin)
|
|
|
|
["(" ")" "[" "]"] @punctuation.bracket
|
|
|
|
[";" ":"] @punctuation.delimiter
|
|
|
|
(lifetime (identifier) @keyword.storage)
|
|
|
|
(string_literal) @string
|
|
(regex_literal) @string
|