mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-16 02:10:15 -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
|
|
@ -20,40 +20,40 @@
|
|||
; Methods
|
||||
|
||||
(method_definition
|
||||
(method_signature (method_identifier) @method))
|
||||
(method_signature (method_identifier) @function.method))
|
||||
|
||||
(expression
|
||||
(opcode) @_invoke
|
||||
(body
|
||||
(full_method_signature
|
||||
(method_signature (method_identifier) @method.call)))
|
||||
(method_signature (method_identifier) @function.method.call)))
|
||||
(#lua-match? @_invoke "^invoke"))
|
||||
|
||||
(method_handle
|
||||
(full_method_signature
|
||||
(method_signature (method_identifier) @method.call)))
|
||||
(method_signature (method_identifier) @function.method.call)))
|
||||
|
||||
(custom_invoke
|
||||
. (identifier) @method.call
|
||||
(method_signature (method_identifier) @method.call))
|
||||
. (identifier) @function.method.call
|
||||
(method_signature (method_identifier) @function.method.call))
|
||||
|
||||
(annotation_value
|
||||
(body
|
||||
(method_signature (method_identifier) @method.call)))
|
||||
(method_signature (method_identifier) @function.method.call)))
|
||||
|
||||
(annotation_value
|
||||
(body
|
||||
(full_method_signature
|
||||
(method_signature (method_identifier) @method.call))))
|
||||
(method_signature (method_identifier) @function.method.call))))
|
||||
|
||||
(field_definition
|
||||
(body
|
||||
(method_signature (method_identifier) @method.call)))
|
||||
(method_signature (method_identifier) @function.method.call)))
|
||||
|
||||
(field_definition
|
||||
(body
|
||||
(full_method_signature
|
||||
(method_signature (method_identifier) @method.call))))
|
||||
(method_signature (method_identifier) @function.method.call))))
|
||||
|
||||
((method_identifier) @constructor
|
||||
(#any-of? @constructor "<init>" "<clinit>"))
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
[
|
||||
(field_identifier)
|
||||
(annotation_key)
|
||||
] @field
|
||||
] @variable.member
|
||||
|
||||
((field_identifier) @constant
|
||||
(#lua-match? @constant "^[%u_]*$"))
|
||||
|
|
@ -79,8 +79,8 @@
|
|||
|
||||
; Parameters
|
||||
|
||||
(parameter) @parameter.builtin
|
||||
(param_identifier) @parameter
|
||||
(parameter) @variable.parameter.builtin
|
||||
(param_identifier) @variable.parameter
|
||||
|
||||
; Labels
|
||||
|
||||
|
|
@ -96,14 +96,14 @@
|
|||
((opcode) @keyword.return
|
||||
(#lua-match? @keyword.return "^return"))
|
||||
|
||||
((opcode) @conditional
|
||||
(#lua-match? @conditional "^if"))
|
||||
((opcode) @keyword.conditional
|
||||
(#lua-match? @keyword.conditional "^if"))
|
||||
|
||||
((opcode) @conditional
|
||||
(#lua-match? @conditional "^cmp"))
|
||||
((opcode) @keyword.conditional
|
||||
(#lua-match? @keyword.conditional "^cmp"))
|
||||
|
||||
((opcode) @exception
|
||||
(#lua-match? @exception "^throw"))
|
||||
((opcode) @keyword.exception
|
||||
(#lua-match? @keyword.exception "^throw"))
|
||||
|
||||
((opcode) @comment
|
||||
(#eq? @comment "nop")) ; haha, anyone get it? ;)
|
||||
|
|
@ -148,7 +148,7 @@
|
|||
|
||||
[
|
||||
".source"
|
||||
] @include
|
||||
] @keyword.import
|
||||
|
||||
[
|
||||
".method"
|
||||
|
|
@ -158,12 +158,12 @@
|
|||
[
|
||||
".catch"
|
||||
".catchall"
|
||||
] @exception
|
||||
] @keyword.exception
|
||||
|
||||
; Literals
|
||||
|
||||
(string) @string
|
||||
(source_directive (string "\"" _ @text.uri "\""))
|
||||
(source_directive (string "\"" _ @string.special.url "\""))
|
||||
(escape_sequence) @string.escape
|
||||
|
||||
(character) @character
|
||||
|
|
@ -176,7 +176,7 @@
|
|||
(float)
|
||||
(NaN)
|
||||
(Infinity)
|
||||
] @float
|
||||
] @number.float
|
||||
|
||||
(boolean) @boolean
|
||||
|
||||
|
|
@ -184,7 +184,7 @@
|
|||
|
||||
; Misc
|
||||
|
||||
(annotation_visibility) @storageclass
|
||||
(annotation_visibility) @keyword.storage
|
||||
|
||||
(access_modifier) @type.qualifier
|
||||
|
||||
|
|
@ -204,7 +204,7 @@
|
|||
"/"
|
||||
] @punctuation.delimiter
|
||||
|
||||
(line_directive (number) @text.underline @text.literal)
|
||||
(line_directive (number) @string.special)
|
||||
|
||||
; Comments
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue