mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-02 03:26:52 -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`
47 lines
1,009 B
R
47 lines
1,009 B
R
init <- 1
|
|
# ^ @variable
|
|
# ^ @operator
|
|
# ^ @number.float
|
|
|
|
r"{(\1\2)}" -> `%r%`
|
|
# ^ @string
|
|
# ^ @string.escape
|
|
# ^ @operator
|
|
# ^ @variable
|
|
|
|
|
|
foo <- c(1L, 2L)
|
|
# ^ @function.call
|
|
# ^ @number
|
|
|
|
b <- list(TRUE, FALSE, NA, Inf)
|
|
# ^ @boolean
|
|
# ^ @boolean
|
|
# ^ @constant.builtin
|
|
# ^ @constant.builtin
|
|
|
|
b <- list(name = "r", version = R.version$major)
|
|
# ^ @variable.parameter
|
|
# ^ @string
|
|
# ^ @operator
|
|
# ^ @variable.member
|
|
|
|
Lang$new(name = "r")$print()
|
|
# ^ @function.method.call
|
|
|
|
for(i in 1:10) {
|
|
# <- @keyword.repeat
|
|
# ^ @keyword.repeat
|
|
}
|
|
|
|
add <- function(a, b = 1, ...) {
|
|
# ^ @keyword.function
|
|
# ^ @variable.parameter
|
|
# ^ @variable.parameter
|
|
# ^ @keyword
|
|
return(a + b)
|
|
}
|
|
|
|
base::letters
|
|
# ^ @module
|
|
# ^ @variable
|