git.iko.soy/helix
on master help sign in
javascript queries: fix parameters (#3280)
59bf166ChrHorn
runtime/queries/javascript/highlights-params.scmdeleted−12
compare with master
unifiedsplit
@@ -1,12 +0,0 @@
1−(formal_parameters
2− [
3− (identifier) @variable.parameter
4− (array_pattern
5− (identifier) @variable.parameter)
6− (object_pattern
7− [
8− (pair_pattern value: (identifier) @variable.parameter)
9− (shorthand_property_identifier_pattern) @variable.parameter
10− ])
11− ]
12−)
runtime/queries/javascript/highlights.scm+37
@@ -46,6 +46,43 @@
46(assignment_expression
46(assignment_expression
47 left: (identifier) @function
47 left: (identifier) @function
48 right: [(function) (arrow_function)])
48 right: [(function) (arrow_function)])
49+
50+; Function and method parameters
51+;-------------------------------
52+
53+; (p) => ...
54+(formal_parameters
55+ (identifier) @variable.parameter)
56+
57+; (...p) => ...
58+(formal_parameters
59+ (rest_pattern
60+ (identifier) @variable.parameter))
61+
62+; ({ p }) => ...
63+(formal_parameters
64+ (object_pattern
65+ (shorthand_property_identifier_pattern) @variable.parameter))
66+
67+; ({ a: p }) => ...
68+(formal_parameters
69+ (object_pattern
70+ (pair_pattern
71+ value: (identifier) @variable.parameter)))
72+
73+; ([ p ]) => ...
74+(formal_parameters
75+ (array_pattern
76+ (identifier) @variable.parameter))
77+
78+; (p = 1) => ...
79+(formal_parameters
80+ (assignment_pattern
81+ left: (identifier) @variable.parameter))
82+
83+; p => ...
84+(arrow_function
85+ parameter: (identifier) @variable.parameter)
49
86
50; Function and method calls
87; Function and method calls
51;--------------------------
88;--------------------------
runtime/queries/javascript/locals.scm+7−1
@@ -12,7 +12,13 @@
12; Definitions
12; Definitions
13;------------
13;------------
14
14
15−(pattern/identifier)@local.definition
15+(pattern/identifier) @local.definition
16+
17+(pattern/rest_pattern
18+ (identifier) @local.definition)
19+
20+(arrow_function
21+ parameter: (identifier) @local.definition)
16
22
17(variable_declarator
23(variable_declarator
18 name: (identifier) @local.definition)
24 name: (identifier) @local.definition)