Skip to content

Commit

Permalink
javascript queries: fix parameters (helix-editor#3280)
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrHorn authored and thomasskk committed Sep 9, 2022
1 parent b5d2d04 commit 8e70fe5
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 13 deletions.
12 changes: 0 additions & 12 deletions runtime/queries/javascript/highlights-params.scm

This file was deleted.

37 changes: 37 additions & 0 deletions runtime/queries/javascript/highlights.scm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,43 @@
(assignment_expression
left: (identifier) @function
right: [(function) (arrow_function)])

; Function and method parameters
;-------------------------------

; (p) => ...
(formal_parameters
(identifier) @variable.parameter)

; (...p) => ...
(formal_parameters
(rest_pattern
(identifier) @variable.parameter))

; ({ p }) => ...
(formal_parameters
(object_pattern
(shorthand_property_identifier_pattern) @variable.parameter))

; ({ a: p }) => ...
(formal_parameters
(object_pattern
(pair_pattern
value: (identifier) @variable.parameter)))

; ([ p ]) => ...
(formal_parameters
(array_pattern
(identifier) @variable.parameter))

; (p = 1) => ...
(formal_parameters
(assignment_pattern
left: (identifier) @variable.parameter))

; p => ...
(arrow_function
parameter: (identifier) @variable.parameter)

; Function and method calls
;--------------------------
Expand Down
8 changes: 7 additions & 1 deletion runtime/queries/javascript/locals.scm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@
; Definitions
;------------

(pattern/identifier)@local.definition
(pattern/identifier) @local.definition

(pattern/rest_pattern
(identifier) @local.definition)

(arrow_function
parameter: (identifier) @local.definition)

(variable_declarator
name: (identifier) @local.definition)
Expand Down

0 comments on commit 8e70fe5

Please sign in to comment.