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`
61 lines
1.1 KiB
Scheme
61 lines
1.1 KiB
Scheme
;; Comments
|
|
(comment) @comment @spell
|
|
|
|
;; Generic Key-value pairs and dictionary keywords
|
|
(key_value
|
|
keyword: (identifier) @function
|
|
)
|
|
(dict
|
|
key: (identifier) @type
|
|
)
|
|
|
|
;; Macros
|
|
(macro
|
|
"$" @keyword.conditional
|
|
(prev_scope)* @keyword.conditional
|
|
(identifier)* @module
|
|
)
|
|
|
|
|
|
;; Directives
|
|
"#" @keyword.conditional
|
|
(preproc_call
|
|
directive: (identifier)* @keyword.conditional
|
|
argument: (identifier)* @module
|
|
)
|
|
((preproc_call
|
|
argument: (identifier)* @module) @keyword.conditional
|
|
(#eq? @keyword.conditional "ifeq"))
|
|
((preproc_call) @keyword.conditional
|
|
(#any-of? @keyword.conditional "else" "endif"))
|
|
|
|
;; Literals
|
|
(number_literal) @number.float
|
|
(string_literal) @string
|
|
(escape_sequence) @string.escape
|
|
(boolean) @boolean
|
|
|
|
;; Treat [m^2 s^-2] the same as if it was put in numbers format
|
|
(dimensions dimension: (identifier) @number.float)
|
|
|
|
;; Punctuation
|
|
[
|
|
"("
|
|
")"
|
|
"["
|
|
"]"
|
|
"{"
|
|
"}"
|
|
"#{"
|
|
"#}"
|
|
"|-"
|
|
"-|"
|
|
"<!--("
|
|
")-->"
|
|
"$$"
|
|
] @punctuation.bracket
|
|
|
|
";" @punctuation.delimiter
|
|
|
|
((identifier) @constant.builtin
|
|
(#any-of? @constant.builtin "uniform" "non-uniform" "and" "or"))
|