fix(gdscript/jai): Replace with supported faces (#229)

* fix(gdscript/jai): Replace with supported face

* imp hl

* Update jai

* update query

* hl param

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Unreleased
+- Replace with supported faces for `GDScript` and `Jai`
 
 ## 0.12.32 - 2023-09-01
 

queries/gdscript/highlights.scm

@@ -12,8 +12,8 @@
 (null) @constant
 (setter) @function
 (getter) @function
-(set_body "set" @keyword.function)
-(get_body "get" @keyword.function)
+(set_body "set" @keyword)
+(get_body "get" @keyword)
 (static_keyword) @type.qualifier
 (tool_statement) @keyword
 (breakpoint_statement) @debug
@@ -91,9 +91,9 @@
 
 ["," "." ":"] @punctuation.delimiter
 
-["if" "elif" "else" "match"] @conditional
+["if" "elif" "else" "match"] @keyword
 
-["for" "while" "break" "continue"] @repeat
+["for" "while" "break" "continue"] @keyword
 
 [
   "~"
@@ -135,7 +135,7 @@
   "is"
   "not"
   "or"
-] @keyword.operator
+] @keyword
 
 [
   "pass"
@@ -156,11 +156,11 @@
   "puppetsync"
 ] @keyword
 
-"func" @keyword.function
+"func" @keyword
 
 [
   "return"
-] @keyword.return
+] @keyword
 
 [
   "await"

queries/jai/highlights.scm

@@ -1,12 +1,48 @@
-; highlights.scm
+;; highlights.scm
 
-"if" @keyword
-"return" @keyword
-"else" @keyword
-"for" @keyword
-"while" @keyword
-"using" @keyword
-"struct" @type
+[
+ (cast_expression)
+ ] @type
+
+[
+ "if"
+ "ifx"
+ "then"
+ "else"
+ "for"
+ "while"
+ "break"
+ "return"
+ ] @keyword
+
+(variable_initializer (identifier) @type)
+(operator_definition) @operator
+
+(parameter (identifier) (identifier) @type)
+(trailing_return_types (parameter (identifier) @type))
+
+[
+ (expression_like_directive)
+ "#assert"
+ "#type_info_none"
+ "#type_info_procedures_are_void_pointers"
+ "#no_padding"
+ "#specified"
+ "#must"
+ "#deprecated"
+ (trailing_directive)
+ "#code"
+ "#complete"
+ (operator_like_directive)
+ "#foreign"
+ "#align"
+ "#module_parameters"
+ (module_scope_directive)
+ "#if"
+ "#load"
+ "#insert"
+ "#program_export"
+ ] @function.macro
 
 (string_literal) @string
 ;;(built_in_type) @type