Update tree-sitter-sql and improve highlight queries (#5683)

helix-editor · Jan 28, 2023 · 482cc22 · 482cc22
1 parent 2c6bf6f
commit 482cc22
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git 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 = "2743c7b5e710e6854d4e8c14c302548b436e2a1f" }
+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "4fe05b2d81565ddb689d2f415e07afdacc515c52" }
 
 [[language]]
 name = "gdscript"

diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
@@ -42,33 +42,25 @@
   "."
 ] @punctuation.delimiter
 
-[
-  "*"
-  "+"
-  "-"
-  "/"
-  "%"
-  "^"
-  "||"  
-  "="
-  "<"
-  "<="
-  "!="
-  ">="
-  ">"
-] @operator
+(binary_expression
+  operator: _ @operator)
+
+(unary_expression
+  operator: _ @operator)
+
+(all_fields) @special
 
 [
   (keyword_null)
   (keyword_true)
   (keyword_false)
 ] @constant.builtin
 
-(literal) @string
-
 ((literal) @constant.numeric
   (#match? @constant.numeric "^(-?\d*\.?\d*)$"))
 
+(literal) @string
+
 [
   (keyword_select)
   (keyword_delete)
@@ -146,6 +138,8 @@
   (keyword_commit)
   (keyword_rollback)
   (keyword_transaction)
+  (keyword_group_concat)
+  (keyword_separator)
 ] @keyword
 
 [