mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-14 01:10:02 -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
|
|
@ -8,10 +8,10 @@
|
|||
(type_spec name: (type_identifier) @type.definition)
|
||||
(field_identifier) @property
|
||||
(identifier) @variable
|
||||
(package_identifier) @namespace
|
||||
(package_identifier) @module
|
||||
|
||||
(parameter_declaration (identifier) @parameter)
|
||||
(variadic_parameter_declaration (identifier) @parameter)
|
||||
(parameter_declaration (identifier) @variable.parameter)
|
||||
(variadic_parameter_declaration (identifier) @variable.parameter)
|
||||
|
||||
(label_name) @label
|
||||
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
(call_expression
|
||||
function: (selector_expression
|
||||
field: (field_identifier) @method.call))
|
||||
field: (field_identifier) @function.method.call))
|
||||
|
||||
; Function definitions
|
||||
|
||||
|
|
@ -33,10 +33,10 @@
|
|||
name: (identifier) @function)
|
||||
|
||||
(method_declaration
|
||||
name: (field_identifier) @method)
|
||||
name: (field_identifier) @function.method)
|
||||
|
||||
(method_spec
|
||||
name: (field_identifier) @method)
|
||||
name: (field_identifier) @function.method)
|
||||
|
||||
; Constructors
|
||||
|
||||
|
|
@ -112,19 +112,19 @@
|
|||
"return" @keyword.return
|
||||
"go" @keyword.coroutine
|
||||
|
||||
"for" @repeat
|
||||
"for" @keyword.repeat
|
||||
|
||||
[
|
||||
"import"
|
||||
"package"
|
||||
] @include
|
||||
] @keyword.import
|
||||
|
||||
[
|
||||
"else"
|
||||
"case"
|
||||
"switch"
|
||||
"if"
|
||||
] @conditional
|
||||
] @keyword.conditional
|
||||
|
||||
|
||||
;; Builtin types
|
||||
|
|
@ -204,7 +204,7 @@
|
|||
(escape_sequence) @string.escape
|
||||
|
||||
(int_literal) @number
|
||||
(float_literal) @float
|
||||
(float_literal) @number.float
|
||||
(imaginary_literal) @number
|
||||
|
||||
[
|
||||
|
|
@ -218,8 +218,8 @@
|
|||
] @constant.builtin
|
||||
|
||||
(keyed_element
|
||||
. (literal_element (identifier) @field))
|
||||
(field_declaration name: (field_identifier) @field)
|
||||
. (literal_element (identifier) @variable.member))
|
||||
(field_declaration name: (field_identifier) @variable.member)
|
||||
|
||||
; Comments
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
(
|
||||
(method_declaration
|
||||
name: (field_identifier) @local.definition.method); @method
|
||||
name: (field_identifier) @local.definition.method); @function.method
|
||||
)
|
||||
|
||||
(short_var_declaration
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue