diff options
| author | Riley Bruins <ribru17@hotmail.com> | 2024-06-28 21:52:23 -0700 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2024-06-29 09:26:53 +0200 |
| commit | f0e3b5c5fe38d0012c63368db90017fef87c85a2 (patch) | |
| tree | 70d8c5d96d6370b872904ee1e278a97b5ac1b6e1 | |
| parent | bot(lockfile): update templ, zig (diff) | |
| download | nvim-treesitter-f0e3b5c5fe38d0012c63368db90017fef87c85a2.tar nvim-treesitter-f0e3b5c5fe38d0012c63368db90017fef87c85a2.tar.gz nvim-treesitter-f0e3b5c5fe38d0012c63368db90017fef87c85a2.tar.bz2 nvim-treesitter-f0e3b5c5fe38d0012c63368db90017fef87c85a2.tar.lz nvim-treesitter-f0e3b5c5fe38d0012c63368db90017fef87c85a2.tar.xz nvim-treesitter-f0e3b5c5fe38d0012c63368db90017fef87c85a2.tar.zst nvim-treesitter-f0e3b5c5fe38d0012c63368db90017fef87c85a2.zip | |
fix(r): resolve highlight regressions
| -rw-r--r-- | queries/r/highlights.scm | 17 | ||||
| -rw-r--r-- | tests/query/highlights/r/test.r | 7 |
2 files changed, 15 insertions, 9 deletions
diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm index d6d1da0e4..c849dd838 100644 --- a/queries/r/highlights.scm +++ b/queries/r/highlights.scm @@ -51,6 +51,7 @@ "$" "@" ":" + "!" "special" ] @operator @@ -86,6 +87,12 @@ (call function: (identifier) @function.call) +(extract_operator + rhs: (identifier) @variable.member) + +function: (extract_operator + rhs: (identifier) @function.method.call) + ; Parameters (parameters (parameter @@ -110,12 +117,7 @@ (function_definition name: "\\" @operator) -[ - "in" - (return) - (next) - (break) -] @keyword +(return) @keyword.return [ "if" @@ -126,6 +128,9 @@ "while" "repeat" "for" + "in" + (break) + (next) ] @keyword.repeat [ diff --git a/tests/query/highlights/r/test.r b/tests/query/highlights/r/test.r index 667be4bea..5fa36cc56 100644 --- a/tests/query/highlights/r/test.r +++ b/tests/query/highlights/r/test.r @@ -23,14 +23,14 @@ b <- list(name = "r", version = R.version$major) # ^ @variable.parameter # ^ @string # ^ @operator -# ^ @variable +# ^ @variable.member Lang$new(name = "r")$print() -# ^ @variable +# ^ @function.method.call for(i in 1:10) { # <- @keyword.repeat -# ^ @keyword +# ^ @keyword.repeat } add <- function(a, b = 1, ...) { @@ -39,6 +39,7 @@ add <- function(a, b = 1, ...) { # ^ @variable.parameter # ^ @constant.builtin return(a + b) +# ^ @keyword.return } base::letters |