@@ -1,19 +1,20 @@
1−(keyword_gist) @function.builtin
2−(keyword_btree) @function.builtin
31(keyword_btree) @function.builtin
42(keyword_hash) @function.builtin
3+(keyword_gist) @function.builtin
54(keyword_spgist) @function.builtin
65(keyword_gin) @function.builtin
76(keyword_brin) @function.builtin
8−(keyword_float) @function.builtin
97
10−(invocation
11− name: (identifier) @function.builtin
12− parameter: [(field)]? @variable.other.member)
8+(cast
9+ name: (identifier) @function.builtin)
1310
1411(count
15− name: (identifier) @function.builtin
16− parameter: [(field)]? @variable.other.member)
12+ name: (identifier) @function.builtin)
13+
14+(keyword_group_concat) @function.builtin
15+
16+(invocation
17+ name: (identifier) @function.builtin)
1718
1819(table_reference
1920 name: (identifier) @namespace)
@@ -28,7 +29,6 @@
2829 table_alias: (identifier) @variable.parameter
2930 name: (identifier) @variable.other.member)
3031
31−
3232(comment) @comment
3333
3434[
@@ -102,12 +102,16 @@
102102 (keyword_as)
103103 (keyword_distinct)
104104 (keyword_constraint)
105+ ; (keyword_cast)
105106 ; (keyword_count)
107+ ; (keyword_group_concat)
108+ (keyword_separator)
106109 (keyword_max)
107110 (keyword_min)
108111 (keyword_avg)
109112 (keyword_end)
110113 (keyword_force)
114+ (keyword_ignore)
111115 (keyword_using)
112116 (keyword_use)
113117 (keyword_index)
@@ -117,8 +121,6 @@
117121 (keyword_auto_increment)
118122 (keyword_default)
119123 (keyword_cascade)
120− (keyword_between)
121− (keyword_window)
122124 (keyword_with)
123125 (keyword_no)
124126 (keyword_data)
@@ -129,6 +131,7 @@
129131 (keyword_owner)
130132 (keyword_temp)
131133 (keyword_temporary)
134+ (keyword_unlogged)
132135 (keyword_union)
133136 (keyword_all)
134137 (keyword_except)
@@ -138,8 +141,35 @@
138141 (keyword_commit)
139142 (keyword_rollback)
140143 (keyword_transaction)
141− (keyword_group_concat)
142− (keyword_separator)
144+ (keyword_over)
145+ (keyword_nulls)
146+ (keyword_first)
147+ (keyword_last)
148+ (keyword_window)
149+ (keyword_range)
150+ (keyword_rows)
151+ (keyword_groups)
152+ (keyword_between)
153+ (keyword_unbounded)
154+ (keyword_preceding)
155+ (keyword_following)
156+ (keyword_exclude)
157+ (keyword_current)
158+ (keyword_row)
159+ (keyword_ties)
160+ (keyword_others)
161+ (keyword_only)
162+ (keyword_unique)
163+ (keyword_concurrently)
164+ ; (keyword_btree)
165+ ; (keyword_hash)
166+ ; (keyword_gist)
167+ ; (keyword_spgist)
168+ ; (keyword_gin)
169+ ; (keyword_brin)
170+ (keyword_like)
171+ (keyword_similar)
172+ (keyword_preserve)
143173] @keyword
144174
145175[
@@ -159,6 +189,7 @@
159189
160190[
161191 (keyword_boolean)
192+
162193 (keyword_smallserial)
163194 (keyword_serial)
164195 (keyword_bigserial)
@@ -170,6 +201,7 @@
170201 (numeric)
171202 (keyword_real)
172203 (double)
204+ (float)
173205
174206 (keyword_money)
175207
@@ -194,4 +226,15 @@
194226 (keyword_geography)
195227 (keyword_box2d)
196228 (keyword_box3d)
229+
230+ (char)
231+ (varchar)
232+ (numeric)
233+
234+ (keyword_oid)
235+ (keyword_name)
236+ (keyword_regclass)
237+ (keyword_regnamespace)
238+ (keyword_regproc)
239+ (keyword_regtype)
197240] @type.builtin