on master help sign in
feat: Update `tree-sitter-sql` and migrate `highlights.scm` to match grammar (#5772)
3041236LeoniePhiline
languages.toml+1−1
@@ -1434,7 +1434,7 @@ injection-regex = "sql"
1434
1434
1435[[grammar]]
1435[[grammar]]
1436name = "sql"
1436name = "sql"
1437−source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "4fe05b2d81565ddb689d2f415e07afdacc515c52" }
1437+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "286e10c5bc5d1703ee8f9afb351165a9a6182be1" }
1438
1438
1439[[language]]
1439[[language]]
1440name = "gdscript"
1440name = "gdscript"
runtime/queries/sql/highlights.scm+56−13
@@ -1,19 +1,20 @@
1−(keyword_gist) @function.builtin
2−(keyword_btree) @function.builtin
3(keyword_btree) @function.builtin
1(keyword_btree) @function.builtin
4(keyword_hash) @function.builtin
2(keyword_hash) @function.builtin
3+(keyword_gist) @function.builtin
5(keyword_spgist) @function.builtin
4(keyword_spgist) @function.builtin
6(keyword_gin) @function.builtin
5(keyword_gin) @function.builtin
7(keyword_brin) @function.builtin
6(keyword_brin) @function.builtin
8−(keyword_float) @function.builtin
9
7
10−(invocation
8+(cast
11− name: (identifier) @function.builtin
9+ name: (identifier) @function.builtin)
12− parameter: [(field)]? @variable.other.member)
13
10
14(count
11(count
15− name: (identifier) @function.builtin
12+ name: (identifier) @function.builtin)
16− parameter: [(field)]? @variable.other.member)
13+
14+(keyword_group_concat) @function.builtin
15+
16+(invocation
17+ name: (identifier) @function.builtin)
17
18
18(table_reference
19(table_reference
19 name: (identifier) @namespace)
20 name: (identifier) @namespace)
@@ -28,7 +29,6 @@
28 table_alias: (identifier) @variable.parameter
29 table_alias: (identifier) @variable.parameter
29 name: (identifier) @variable.other.member)
30 name: (identifier) @variable.other.member)
30
31
31−
32(comment) @comment
32(comment) @comment
33
33
34[
34[
@@ -102,12 +102,16 @@
102 (keyword_as)
102 (keyword_as)
103 (keyword_distinct)
103 (keyword_distinct)
104 (keyword_constraint)
104 (keyword_constraint)
105+ ; (keyword_cast)
105 ; (keyword_count)
106 ; (keyword_count)
107+ ; (keyword_group_concat)
108+ (keyword_separator)
106 (keyword_max)
109 (keyword_max)
107 (keyword_min)
110 (keyword_min)
108 (keyword_avg)
111 (keyword_avg)
109 (keyword_end)
112 (keyword_end)
110 (keyword_force)
113 (keyword_force)
114+ (keyword_ignore)
111 (keyword_using)
115 (keyword_using)
112 (keyword_use)
116 (keyword_use)
113 (keyword_index)
117 (keyword_index)
@@ -117,8 +121,6 @@
117 (keyword_auto_increment)
121 (keyword_auto_increment)
118 (keyword_default)
122 (keyword_default)
119 (keyword_cascade)
123 (keyword_cascade)
120− (keyword_between)
121− (keyword_window)
122 (keyword_with)
124 (keyword_with)
123 (keyword_no)
125 (keyword_no)
124 (keyword_data)
126 (keyword_data)
@@ -129,6 +131,7 @@
129 (keyword_owner)
131 (keyword_owner)
130 (keyword_temp)
132 (keyword_temp)
131 (keyword_temporary)
133 (keyword_temporary)
134+ (keyword_unlogged)
132 (keyword_union)
135 (keyword_union)
133 (keyword_all)
136 (keyword_all)
134 (keyword_except)
137 (keyword_except)
@@ -138,8 +141,35 @@
138 (keyword_commit)
141 (keyword_commit)
139 (keyword_rollback)
142 (keyword_rollback)
140 (keyword_transaction)
143 (keyword_transaction)
141− (keyword_group_concat)
144+ (keyword_over)
142− (keyword_separator)
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)
143] @keyword
173] @keyword
144
174
145[
175[
@@ -159,6 +189,7 @@
159
189
160[
190[
161 (keyword_boolean)
191 (keyword_boolean)
192+
162 (keyword_smallserial)
193 (keyword_smallserial)
163 (keyword_serial)
194 (keyword_serial)
164 (keyword_bigserial)
195 (keyword_bigserial)
@@ -170,6 +201,7 @@
170 (numeric)
201 (numeric)
171 (keyword_real)
202 (keyword_real)
172 (double)
203 (double)
204+ (float)
173
205
174 (keyword_money)
206 (keyword_money)
175
207
@@ -194,4 +226,15 @@
194 (keyword_geography)
226 (keyword_geography)
195 (keyword_box2d)
227 (keyword_box2d)
196 (keyword_box3d)
228 (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)
197] @type.builtin
240] @type.builtin