mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-12 00:10:04 -04:00
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:
parent
10dd49958c
commit
1ae9b0e455
263 changed files with 2356 additions and 2337 deletions
|
|
@ -23,12 +23,12 @@
|
|||
|
||||
(primitive_type) @type.builtin
|
||||
|
||||
(field_identifier) @field
|
||||
(field_identifier) @variable.member
|
||||
|
||||
(shorthand_field_initializer (identifier) @field)
|
||||
(shorthand_field_initializer (identifier) @variable.member)
|
||||
|
||||
(mod_item
|
||||
name: (identifier) @namespace)
|
||||
name: (identifier) @module)
|
||||
|
||||
(self) @variable.builtin
|
||||
|
||||
|
|
@ -40,9 +40,9 @@
|
|||
|
||||
(function_signature_item (identifier) @function)
|
||||
|
||||
(parameter (identifier) @parameter)
|
||||
(parameter (identifier) @variable.parameter)
|
||||
|
||||
(closure_parameters (_) @parameter)
|
||||
(closure_parameters (_) @variable.parameter)
|
||||
|
||||
; Function calls
|
||||
|
||||
|
|
@ -79,14 +79,14 @@
|
|||
; Assume that uppercase names in paths are types
|
||||
|
||||
(scoped_identifier
|
||||
path: (identifier) @namespace)
|
||||
path: (identifier) @module)
|
||||
|
||||
(scoped_identifier
|
||||
(scoped_identifier
|
||||
name: (identifier) @namespace))
|
||||
name: (identifier) @module))
|
||||
|
||||
(scoped_type_identifier
|
||||
path: (identifier) @namespace)
|
||||
path: (identifier) @module)
|
||||
|
||||
(scoped_type_identifier
|
||||
path: (identifier) @type
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
|
||||
(scoped_type_identifier
|
||||
(scoped_identifier
|
||||
name: (identifier) @namespace))
|
||||
name: (identifier) @module))
|
||||
|
||||
((scoped_identifier
|
||||
path: (identifier) @type)
|
||||
|
|
@ -123,16 +123,16 @@
|
|||
[
|
||||
(crate)
|
||||
(super)
|
||||
] @namespace
|
||||
] @module
|
||||
|
||||
(scoped_use_list
|
||||
path: (identifier) @namespace)
|
||||
path: (identifier) @module)
|
||||
|
||||
(scoped_use_list
|
||||
path: (scoped_identifier
|
||||
(identifier) @namespace))
|
||||
(identifier) @module))
|
||||
|
||||
(use_list (scoped_identifier (identifier) @namespace . (_)))
|
||||
(use_list (scoped_identifier (identifier) @module . (_)))
|
||||
|
||||
(use_list (identifier) @type (#lua-match? @type "^[A-Z]"))
|
||||
|
||||
|
|
@ -216,7 +216,7 @@
|
|||
|
||||
(integer_literal) @number
|
||||
|
||||
(float_literal) @float
|
||||
(float_literal) @number.float
|
||||
|
||||
[
|
||||
(raw_string_literal)
|
||||
|
|
@ -232,9 +232,9 @@
|
|||
[
|
||||
"use"
|
||||
"mod"
|
||||
] @include
|
||||
] @keyword.import
|
||||
|
||||
(use_as_clause "as" @include)
|
||||
(use_as_clause "as" @keyword.import)
|
||||
|
||||
[
|
||||
"default"
|
||||
|
|
@ -266,9 +266,9 @@
|
|||
"static"
|
||||
"dyn"
|
||||
"extern"
|
||||
] @storageclass
|
||||
] @keyword.storage
|
||||
|
||||
(lifetime ["'" (identifier)] @storageclass.lifetime)
|
||||
(lifetime ["'" (identifier)] @keyword.storage.lifetime)
|
||||
|
||||
"fn" @keyword.function
|
||||
|
||||
|
|
@ -281,19 +281,19 @@
|
|||
|
||||
(qualified_type "as" @keyword.operator)
|
||||
|
||||
(use_list (self) @namespace)
|
||||
(use_list (self) @module)
|
||||
|
||||
(scoped_use_list (self) @namespace)
|
||||
(scoped_use_list (self) @module)
|
||||
|
||||
(scoped_identifier [(crate) (super) (self)] @namespace)
|
||||
(scoped_identifier [(crate) (super) (self)] @module)
|
||||
|
||||
(visibility_modifier [(crate) (super) (self)] @namespace)
|
||||
(visibility_modifier [(crate) (super) (self)] @module)
|
||||
|
||||
[
|
||||
"if"
|
||||
"else"
|
||||
"match"
|
||||
] @conditional
|
||||
] @keyword.conditional
|
||||
|
||||
[
|
||||
"break"
|
||||
|
|
@ -301,10 +301,10 @@
|
|||
"in"
|
||||
"loop"
|
||||
"while"
|
||||
] @repeat
|
||||
] @keyword.repeat
|
||||
|
||||
"for" @keyword
|
||||
(for_expression "for" @repeat)
|
||||
(for_expression "for" @keyword.repeat)
|
||||
|
||||
; Operators
|
||||
|
||||
|
|
@ -370,16 +370,16 @@
|
|||
(empty_type "!" @type.builtin)
|
||||
|
||||
(macro_invocation
|
||||
macro: (identifier) @exception
|
||||
"!" @exception
|
||||
(#eq? @exception "panic"))
|
||||
macro: (identifier) @keyword.exception
|
||||
"!" @keyword.exception
|
||||
(#eq? @keyword.exception "panic"))
|
||||
|
||||
(macro_invocation
|
||||
macro: (identifier) @exception
|
||||
"!" @exception
|
||||
(#contains? @exception "assert"))
|
||||
macro: (identifier) @keyword.exception
|
||||
"!" @keyword.exception
|
||||
(#contains? @keyword.exception "assert"))
|
||||
|
||||
(macro_invocation
|
||||
macro: (identifier) @debug
|
||||
"!" @debug
|
||||
(#eq? @debug "dbg"))
|
||||
macro: (identifier) @keyword.debug
|
||||
"!" @keyword.debug
|
||||
(#eq? @keyword.debug "dbg"))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue