Fix C++ syntax highlighting, and improve C & WGSL highlighting

languages.toml

@@ -184,7 +184,7 @@ args = { console = "internalConsole", attachCommands = [ "platform select remote
 
 [[grammar]]
 name = "c"
-source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "f05e279aedde06a25801c3f2b2cc8ac17fac52ae" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a" }
 
 [[language]]
 name = "cpp"
@@ -221,7 +221,7 @@ args = { console = "internalConsole", attachCommands = [ "platform select remote
 
 [[grammar]]
 name = "cpp"
-source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "e8dcc9d2b404c542fd236ea5f7208f90be8a6e89" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "f40125503642845492d87fa56ece3ed26a4ef4db" }
 
 [[language]]
 name = "c-sharp"

runtime/queries/c/highlights.scm

@@ -1,61 +1,75 @@
 (storage_class_specifier) @keyword.storage
 
-"goto" @keyword
-"register" @keyword
-"break" @keyword
-"case" @keyword
-"continue" @keyword
-"default" @keyword
-"do" @keyword
-"else" @keyword
-"enum" @keyword
-"extern" @keyword
-"for" @keyword
-"if" @keyword
-"inline" @keyword
-"return" @keyword
-"sizeof" @keyword
-"struct" @keyword
-"switch" @keyword
-"typedef" @keyword
-"union" @keyword
-"volatile" @keyword
-"while" @keyword
-"const" @keyword
+[
+  "register"
+  "const"
+  "enum"
+  "extern"
+  "inline"
+  "sizeof"
+  "struct"
+  "typedef"
+  "union"
+  "volatile"
+] @keyword
+
+[
+  "for"
+  "do"
+  "while"
+  "break"
+  "continue"
+] @keyword.control.repeat
+
+[
+  "goto"
+  "if"
+  "else"
+  "switch"
+  "case"
+  "default"
+] @keyword.control.conditional
+
+"return" @keyword.control.return
 
 [
- "#define"
- "#elif"
- "#else"
- "#endif"
- "#if"
- "#ifdef"
- "#ifndef"
- "#include"
- (preproc_directive)
+  "defined"
+  "#define"
+  "#elif"
+  "#else"
+  "#endif"
+  "#if"
+  "#ifdef"
+  "#ifndef"
+  "#include"
+  (preproc_directive)
 ] @keyword.directive
 
-"--" @operator
-"-" @operator
-"-=" @operator
-"->" @operator
-"=" @operator
-"!=" @operator
-"*" @operator
-"&" @operator
-"&&" @operator
-"+" @operator
-"++" @operator
-"+=" @operator
-"<" @operator
-"==" @operator
-">" @operator
-"||" @operator
-">=" @operator
-"<=" @operator
-
-"." @punctuation.delimiter
-";" @punctuation.delimiter
+[
+  "--"
+  "-"
+  "-="
+  "->"
+  "="
+  "!="
+  "*"
+  "&"
+  "&&"
+  "+"
+  "++"
+  "+="
+  "<"
+  "=="
+  ">"
+  "||"
+  ">="
+  "<="
+  "::"
+] @operator
+
+["," "." ":" ";"] @punctuation.delimiter
+
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 
 [(true) (false)] @constant.builtin.boolean
 
@@ -73,20 +87,23 @@
 (call_expression
   function: (field_expression
     field: (field_identifier) @function))
+(function_declarator) @function
 (function_declarator
-  declarator: (identifier) @function)
+  parameters: (parameter_list) @variable.parameter)
 (preproc_function_def
   name: (identifier) @function.special)
 
+(compound_statement) @variable
+(init_declarator) @variable
 (field_identifier) @variable.other.member
 (statement_identifier) @label
+(struct_specifier) @type
+(type_definition) @type
 (type_identifier) @type
-(primitive_type) @type
+(primitive_type) @type.builtin
 (sized_type_specifier) @type
 
 ((identifier) @constant
  (#match? @constant "^[A-Z][A-Z\\d_]*$"))
 
-(identifier) @variable
-
 (comment) @comment

runtime/queries/cpp/highlights.scm

@@ -12,13 +12,6 @@
 (template_method
   name: (field_identifier) @function)
 
-(template_function
-  name: (identifier) @function)
-
-(function_declarator
-  declarator: (qualified_identifier
-    name: (identifier) @function))
-
 (function_declarator
   declarator: (qualified_identifier
     name: (identifier) @function))
@@ -28,9 +21,7 @@
 
 ; Types
 
-((namespace_identifier) @type
- (#match? @type "^[A-Z]"))
-
+(namespace_identifier) @namespace
 (auto) @type
 
 ; Constants
@@ -40,27 +31,36 @@
 
 ; Keywords
 
-"catch" @keyword
-"class" @keyword
-"constexpr" @keyword
-"delete" @keyword
-"explicit" @keyword
-"final" @keyword
-"friend" @keyword
-"mutable" @keyword
-"namespace" @keyword
-"noexcept" @keyword
-"new" @keyword
-"override" @keyword
-"private" @keyword
-"protected" @keyword
-"public" @keyword
-"template" @keyword
-"throw" @keyword
-"try" @keyword
-"typename" @keyword
-"using" @keyword
-"virtual" @keyword
+[
+ "catch"
+ "class"
+ "co_await"
+ "co_return"
+ "co_yield"
+ "constexpr"
+ "constinit"
+ "consteval"
+ "delete"
+ "explicit"
+ "final"
+ "friend"
+ "mutable"
+ "namespace"
+ "noexcept"
+ "new"
+ "override"
+ "private"
+ "protected"
+ "public"
+ "template"
+ "throw"
+ "try"
+ "typename"
+ "using"
+ "virtual"
+ "concept"
+ "requires"
+] @keyword
 
 ; Strings
 

runtime/queries/wgsl/highlights.scm

@@ -110,5 +110,3 @@
     (identifier) @attribute)
 
 (comment) @comment
-
-(ERROR) @error