mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-13 08:50:11 -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
|
|
@ -3,7 +3,7 @@
|
|||
[
|
||||
"import"
|
||||
"module"
|
||||
] @include
|
||||
] @keyword.import
|
||||
|
||||
; Keywords
|
||||
|
||||
|
|
@ -38,14 +38,14 @@
|
|||
"else"
|
||||
"$else"
|
||||
"select"
|
||||
] @conditional
|
||||
] @keyword.conditional
|
||||
|
||||
[
|
||||
"for"
|
||||
"$for"
|
||||
"continue"
|
||||
"break"
|
||||
] @repeat
|
||||
] @keyword.repeat
|
||||
|
||||
"fn" @keyword.function
|
||||
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
"shared"
|
||||
"static"
|
||||
"const"
|
||||
] @storageclass
|
||||
] @keyword.storage
|
||||
|
||||
[
|
||||
"pub"
|
||||
|
|
@ -77,13 +77,13 @@
|
|||
; Namespace
|
||||
|
||||
(module_clause
|
||||
(identifier) @namespace)
|
||||
(identifier) @module)
|
||||
|
||||
(import_path
|
||||
(import_name) @namespace)
|
||||
(import_name) @module)
|
||||
|
||||
(import_alias
|
||||
(import_name) @namespace)
|
||||
(import_name) @module)
|
||||
|
||||
; Literals
|
||||
|
||||
|
|
@ -115,20 +115,20 @@
|
|||
|
||||
; Fields
|
||||
|
||||
(selector_expression field: (reference_expression (identifier) @field))
|
||||
(selector_expression field: (reference_expression (identifier) @variable.member))
|
||||
|
||||
(field_name) @field
|
||||
(field_name) @variable.member
|
||||
|
||||
(struct_field_declaration
|
||||
name: (identifier) @field)
|
||||
name: (identifier) @variable.member)
|
||||
|
||||
; Parameters
|
||||
|
||||
(parameter_declaration
|
||||
name: (identifier) @parameter)
|
||||
name: (identifier) @variable.parameter)
|
||||
|
||||
(receiver
|
||||
name: (identifier) @parameter)
|
||||
name: (identifier) @variable.parameter)
|
||||
|
||||
; Constants
|
||||
|
||||
|
|
@ -158,11 +158,11 @@
|
|||
|
||||
(function_declaration
|
||||
receiver: (receiver)
|
||||
name: (identifier) @method)
|
||||
name: (identifier) @function.method)
|
||||
|
||||
(call_expression
|
||||
name: (selector_expression
|
||||
field: (reference_expression) @method.call))
|
||||
field: (reference_expression) @function.method.call))
|
||||
|
||||
(call_expression
|
||||
name: (reference_expression) @function.call)
|
||||
|
|
@ -428,7 +428,7 @@
|
|||
|
||||
(int_literal) @number
|
||||
|
||||
(float_literal) @float
|
||||
(float_literal) @number.float
|
||||
|
||||
[
|
||||
(c_string_literal)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue