aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Sojka <steelsojka@users.noreply.github.com>2020-07-22 08:40:45 -0500
committerGitHub <noreply@github.com>2020-07-22 08:40:45 -0500
commit39f3abdf7b88636025913ff0bf0ba1e8bcc10283 (patch)
tree3064a85acddd4d1cbbf1d9e8252d8a3feacabb80
parentfixes golang method highlights (overwritten by parameter in the ordering) (diff)
parentadd rest_parameters as definition in javascript (diff)
downloadnvim-treesitter-39f3abdf7b88636025913ff0bf0ba1e8bcc10283.tar
nvim-treesitter-39f3abdf7b88636025913ff0bf0ba1e8bcc10283.tar.gz
nvim-treesitter-39f3abdf7b88636025913ff0bf0ba1e8bcc10283.tar.bz2
nvim-treesitter-39f3abdf7b88636025913ff0bf0ba1e8bcc10283.tar.lz
nvim-treesitter-39f3abdf7b88636025913ff0bf0ba1e8bcc10283.tar.xz
nvim-treesitter-39f3abdf7b88636025913ff0bf0ba1e8bcc10283.tar.zst
nvim-treesitter-39f3abdf7b88636025913ff0bf0ba1e8bcc10283.zip
Merge pull request #209 from steelsojka/master
add rest_parameters as definition in javascript
-rw-r--r--queries/javascript/highlights.scm6
-rw-r--r--queries/javascript/locals.scm14
2 files changed, 14 insertions, 6 deletions
diff --git a/queries/javascript/highlights.scm b/queries/javascript/highlights.scm
index dfbabc977..fe373e617 100644
--- a/queries/javascript/highlights.scm
+++ b/queries/javascript/highlights.scm
@@ -72,7 +72,11 @@
; Variables
;----------
-(formal_parameters (identifier) @variable.parameter)
+(formal_parameters (identifier) @parameter)
+
+(formal_parameters
+ (rest_parameter
+ (identifier) @parameter))
(identifier) @variable
diff --git a/queries/javascript/locals.scm b/queries/javascript/locals.scm
index 9a10db86d..1daefea40 100644
--- a/queries/javascript/locals.scm
+++ b/queries/javascript/locals.scm
@@ -11,22 +11,26 @@
;------------
(formal_parameters
- (identifier) @definition)
+ (identifier) @definition.var)
(formal_parameters
(object_pattern
- (identifier) @definition))
+ (identifier) @definition.var))
(formal_parameters
(object_pattern
- (shorthand_property_identifier) @definition))
+ (shorthand_property_identifier) @definition.var))
(formal_parameters
(array_pattern
- (identifier) @definition))
+ (identifier) @definition.var))
+
+(formal_parameters
+ (rest_parameter
+ (identifier) @definition.var))
(variable_declarator
- name: (identifier) @definition)
+ name: (identifier) @definition.var)
(import_specifier
(identifier) @definition.import)