@@ -2,15 +2,63 @@
22"?>" @tag
33
44; Types
5+[
6+ (primitive_type)
7+ (cast_type)
8+] @type.builtin
9+
10+(named_type
11+ [ (name) @type
12+ (qualified_name (name) @type)])
13+
14+(base_clause
15+ [ (name) @type
16+ (qualified_name (name) @type)])
17+
18+(enum_declaration
19+ name: (name) @type.enum)
520
6−(primitive_type) @type.builtin
7−(cast_type) @type.builtin
8−(named_type (name) @type) @type
9−(named_type (qualified_name) @type) @type
21+(interface_declaration
22+ name: (name) @constructor)
23+
24+(class_declaration
25+ name: (name) @constructor)
26+
27+(trait_declaration
28+ name:(name) @constructor)
1029
1130(namespace_definition
1231 name: (namespace_name (name) @namespace))
1332
33+(namespace_name_as_prefix
34+ (namespace_name (name) @namespace))
35+
36+(namespace_use_clause
37+ [ (name) @namespace
38+ (qualified_name (name) @type) ])
39+
40+(namespace_aliasing_clause (name) @namespace)
41+
42+(class_interface_clause
43+ [(name) @type
44+ (qualified_name (name) @type)])
45+
46+(scoped_call_expression
47+ scope: [(name) @type
48+ (qualified_name (name) @type)])
49+
50+(class_constant_access_expression
51+ . [(name) @constructor
52+ (qualified_name (name) @constructor)]
53+ (name) @constant)
54+
55+(use_declaration (name) @type)
56+
57+(binary_expression
58+ operator: "instanceof"
59+ right: [(name) @type
60+ (qualified_name (name) @type)])
61+
1462; Superglobals
1563(subscript_expression
1664 (variable_name(name) @constant.builtin
@@ -36,6 +84,21 @@
3684(function_definition
3785 name: (name) @function)
3886
87+(nullsafe_member_call_expression
88+ name: (name) @function.method)
89+
90+(object_creation_expression
91+ [(name) @constructor
92+ (qualified_name (name) @constructor)])
93+
94+; Parameters
95+[
96+ (simple_parameter)
97+ (variadic_parameter)
98+] @variable.parameter
99+
100+(argument
101+ (name) @variable.parameter)
39102
40103; Member
41104
@@ -62,68 +125,192 @@
62125
63126(variable_name) @variable
64127
128+; Attributes
129+(attribute_list) @attribute
130+
65131; Basic tokens
66132
67−(string) @string
68−(heredoc) @string
133+[
134+ (string)
135+ (encapsed_string)
136+ (heredoc_body)
137+ (nowdoc_body)
138+ (shell_command_expression)
139+] @string
140+(escape_sequence) @constant.character.escape
141+
69142(boolean) @constant.builtin.boolean
70143(null) @constant.builtin
71144(integer) @constant.numeric.integer
72145(float) @constant.numeric.float
73146(comment) @comment
74147
75−"$" @operator
148+(goto_statement (name) @label)
149+(named_label_statement (name) @label)
76150
77151; Keywords
78152
79153[
80− "abstract"
81− "as"
82− "break"
83− "case"
84− "catch"
85− "class"
86− "const"
87− "continue"
88− "declare"
89154 "default"
90− "do"
91155 "echo"
92− "else"
93− "elseif"
94− "enddeclare"
95− "endforeach"
96− "endif"
97− "endswitch"
98− "endwhile"
99156 "enum"
100157 "extends"
101158 "final"
102− "finally"
103− "foreach"
104− "fn"
105− "function"
159+ "goto"
106160 "global"
107− "if"
108161 "implements"
109− "include_once"
110− "include"
111162 "insteadof"
112− "interface"
113− "match"
114− "namespace"
115163 "new"
116164 "private"
117165 "protected"
118166 "public"
167+] @keyword
168+
169+[
170+ "if"
171+ "else"
172+ "elseif"
173+ "endif"
174+ "switch"
175+ "endswitch"
176+ "case"
177+ "match"
178+ "declare"
179+ "enddeclare"
180+ "??"
181+] @keyword.control.conditional
182+
183+[
184+ "for"
185+ "endfor"
186+ "foreach"
187+ "endforeach"
188+ "while"
189+ "endwhile"
190+ "do"
191+] @keyword.control.repeat
192+
193+[
194+
195+ "include_once"
196+ "include"
119197 "require_once"
120198 "require"
199+ "use"
200+] @keyword.control.import
201+
202+[
121203 "return"
122− "static"
123− "switch"
204+ "break"
205+ "continue"
206+ "yield"
207+] @keyword.control.return
208+
209+[
124210 "throw"
125− "trait"
126211 "try"
127− "use"
128− "while"
129−] @keyword
212+ "catch"
213+ "finally"
214+] @keyword.control.exception
215+
216+[
217+ "as"
218+ "or"
219+ "xor"
220+ "and"
221+ "instanceof"
222+] @keyword.operator
223+
224+[
225+ "fn"
226+ "function"
227+] @keyword.function
228+
229+[
230+ "namespace"
231+ "class"
232+ "interface"
233+ "trait"
234+ "abstract"
235+] @keyword.storage.type
236+
237+[
238+ "static"
239+ "const"
240+] @keyword.storage.modifier
241+
242+[
243+ ","
244+ ";"
245+ ":"
246+ "\\"
247+ ] @punctuation.delimiter
248+
249+[
250+ (php_tag)
251+ "?>"
252+ "("
253+ ")"
254+ "["
255+ "]"
256+ "{"
257+ "}"
258+ "#["
259+] @punctuation.bracket
260+
261+[
262+ "="
263+
264+ "."
265+ "-"
266+ "*"
267+ "/"
268+ "+"
269+ "%"
270+ "**"
271+
272+ "~"
273+ "|"
274+ "^"
275+ "&"
276+ "<<"
277+ ">>"
278+
279+ "->"
280+ "?->"
281+
282+ "=>"
283+
284+ "<"
285+ "<="
286+ ">="
287+ ">"
288+ "<>"
289+ "=="
290+ "!="
291+ "==="
292+ "!=="
293+
294+ "!"
295+ "&&"
296+ "||"
297+
298+ ".="
299+ "-="
300+ "+="
301+ "*="
302+ "/="
303+ "%="
304+ "**="
305+ "&="
306+ "|="
307+ "^="
308+ "<<="
309+ ">>="
310+ "??="
311+ "--"
312+ "++"
313+
314+ "@"
315+ "::"
316+] @operator