mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-07 05:50:04 -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`
64 lines
1.8 KiB
Scheme
64 lines
1.8 KiB
Scheme
; inherits: python
|
|
|
|
;; Compound directives
|
|
["rule" "checkpoint" "module"] @keyword
|
|
|
|
;; Top level directives (eg. configfile, include)
|
|
(module (directive name: _ @keyword))
|
|
|
|
;; Subordinate directives (eg. input, output)
|
|
(_ body: (_ (directive name: _ @label)))
|
|
|
|
;; rule/module/checkpoint names
|
|
(rule_definition name: (identifier) @type)
|
|
(module_definition name: (identifier) @type)
|
|
(checkpoint_definition name: (identifier) @type)
|
|
|
|
|
|
;; Rule imports
|
|
(rule_import
|
|
"use" @keyword.import
|
|
"rule" @keyword.import
|
|
"from" @keyword.import
|
|
"as"? @keyword.import
|
|
"with"? @keyword.import
|
|
)
|
|
|
|
|
|
;; Rule inheritance
|
|
(rule_inheritance
|
|
"use" @keyword
|
|
"rule" @keyword
|
|
"with" @keyword
|
|
)
|
|
|
|
|
|
;; Wildcard names
|
|
(wildcard (identifier) @variable)
|
|
|
|
|
|
;; builtin variables
|
|
((identifier) @variable.builtin
|
|
(#any-of? @variable.builtin "checkpoints" "config" "gather" "rules" "scatter" "workflow"))
|
|
|
|
|
|
;; References to directive labels in wildcard interpolations
|
|
|
|
;; the #any-of? queries are moved above the #has-ancestor? queries to
|
|
;; short-circuit the potentially expensive tree traversal, if possible
|
|
;; see:
|
|
;; https://github.com/nvim-treesitter/nvim-treesitter/pull/4302#issuecomment-1685789790
|
|
|
|
;; directive labels in wildcard context
|
|
((wildcard (identifier) @label)
|
|
(#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
|
|
((wildcard (attribute object: (identifier) @label))
|
|
(#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
|
|
((wildcard (subscript value: (identifier) @label))
|
|
(#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
|
|
|
|
;; directive labels in block context (eg. within 'run:')
|
|
((identifier) @label
|
|
(#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards")
|
|
(#has-ancestor? @label "directive")
|
|
(#has-ancestor? @label "block"))
|