aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeoniePhiline2023-02-02 22:44:36 +0000
committerGitHub2023-02-02 22:44:36 +0000
commit30412366be411335b7e2600e9b4178355c27da15 (patch)
tree864dae06c90faaafa2fcd8378d169b5944a74f6a
parent10fee815c4d1ae952ef0863f3f75c3502e712edb (diff)
feat: Update `tree-sitter-sql` and migrate `highlights.scm` to match grammar (#5772)
* Sort buildin functions alphabetically * fix: Query float type like other numeric types * Update tree-sitter-sql and update highlights.scm to match grammar
-rw-r--r--languages.toml2
-rw-r--r--runtime/queries/sql/highlights.scm69
2 files changed, 57 insertions, 14 deletions
diff --git a/languages.toml b/languages.toml
index 755f577f..09ba2a2a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1434,7 +1434,7 @@ injection-regex = "sql"
[[grammar]]
name = "sql"
-source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "4fe05b2d81565ddb689d2f415e07afdacc515c52" }
+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "286e10c5bc5d1703ee8f9afb351165a9a6182be1" }
[[language]]
name = "gdscript"
diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index aad5ed31..a2d2f7fe 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -1,19 +1,20 @@
-(keyword_gist) @function.builtin
-(keyword_btree) @function.builtin
(keyword_btree) @function.builtin
(keyword_hash) @function.builtin
+(keyword_gist) @function.builtin
(keyword_spgist) @function.builtin
(keyword_gin) @function.builtin
(keyword_brin) @function.builtin
-(keyword_float) @function.builtin
-(invocation
- name: (identifier) @function.builtin
- parameter: [(field)]? @variable.other.member)
+(cast
+ name: (identifier) @function.builtin)
(count
- name: (identifier) @function.builtin
- parameter: [(field)]? @variable.other.member)
+ name: (identifier) @function.builtin)
+
+(keyword_group_concat) @function.builtin
+
+(invocation
+ name: (identifier) @function.builtin)
(table_reference
name: (identifier) @namespace)
@@ -28,7 +29,6 @@
table_alias: (identifier) @variable.parameter
name: (identifier) @variable.other.member)
-
(comment) @comment
[
@@ -102,12 +102,16 @@
(keyword_as)
(keyword_distinct)
(keyword_constraint)
+ ; (keyword_cast)
; (keyword_count)
+ ; (keyword_group_concat)
+ (keyword_separator)
(keyword_max)
(keyword_min)
(keyword_avg)
(keyword_end)
(keyword_force)
+ (keyword_ignore)
(keyword_using)
(keyword_use)
(keyword_index)
@@ -117,8 +121,6 @@
(keyword_auto_increment)
(keyword_default)
(keyword_cascade)
- (keyword_between)
- (keyword_window)
(keyword_with)
(keyword_no)
(keyword_data)
@@ -129,6 +131,7 @@
(keyword_owner)
(keyword_temp)
(keyword_temporary)
+ (keyword_unlogged)
(keyword_union)
(keyword_all)
(keyword_except)
@@ -138,8 +141,35 @@
(keyword_commit)
(keyword_rollback)
(keyword_transaction)
- (keyword_group_concat)
- (keyword_separator)
+ (keyword_over)
+ (keyword_nulls)
+ (keyword_first)
+ (keyword_last)
+ (keyword_window)
+ (keyword_range)
+ (keyword_rows)
+ (keyword_groups)
+ (keyword_between)
+ (keyword_unbounded)
+ (keyword_preceding)
+ (keyword_following)
+ (keyword_exclude)
+ (keyword_current)
+ (keyword_row)
+ (keyword_ties)
+ (keyword_others)
+ (keyword_only)
+ (keyword_unique)
+ (keyword_concurrently)
+ ; (keyword_btree)
+ ; (keyword_hash)
+ ; (keyword_gist)
+ ; (keyword_spgist)
+ ; (keyword_gin)
+ ; (keyword_brin)
+ (keyword_like)
+ (keyword_similar)
+ (keyword_preserve)
] @keyword
[
@@ -159,6 +189,7 @@
[
(keyword_boolean)
+
(keyword_smallserial)
(keyword_serial)
(keyword_bigserial)
@@ -170,6 +201,7 @@
(numeric)
(keyword_real)
(double)
+ (float)
(keyword_money)
@@ -194,4 +226,15 @@
(keyword_geography)
(keyword_box2d)
(keyword_box3d)
+
+ (char)
+ (varchar)
+ (numeric)
+
+ (keyword_oid)
+ (keyword_name)
+ (keyword_regclass)
+ (keyword_regnamespace)
+ (keyword_regproc)
+ (keyword_regtype)
] @type.builtin