Merge remote-tracking branch 'upstream/master' into mix_20240309

2 files changed, 23 insertions, 19 deletions

diff --git a/runtime/queries/c/folds.scm b/runtime/queries/c/folds.scm
index 2e2a6b4d0c..bb26a62eb5 100644
--- a/runtime/queries/c/folds.scm
+++ b/runtime/queries/c/folds.scm
@@ -16,6 +16,7 @@
   (preproc_function_def)
   (initializer_list)
   (gnu_asm_expression)
+  (preproc_include)+
 ] @fold
 
 (compound_statement
diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index c848f68dca..170937c8f8 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -7,16 +7,19 @@
 
 [
   "default"
-  "enum"
-  "struct"
-  "typedef"
-  "union"
   "goto"
   "asm"
   "__asm__"
 ] @keyword
 
 [
+  "enum"
+  "struct"
+  "union"
+  "typedef"
+] @keyword.type
+
+[
   "sizeof"
   "offsetof"
 ] @keyword.operator
@@ -142,9 +145,6 @@
 
 (char_literal) @character
 
-((preproc_arg) @function.macro
-  (#set! "priority" 90))
-
 (preproc_defined) @function.macro
 
 ((field_expression
@@ -159,21 +159,26 @@
 
 (statement_identifier) @label
 
+(declaration
+  type: (type_identifier) @_type
+  declarator: (identifier) @label
+  (#eq? @_type "__label__"))
+
 [
   (type_identifier)
   (type_descriptor)
 ] @type
 
-(storage_class_specifier) @keyword.storage
+(storage_class_specifier) @keyword.modifier
 
 [
   (type_qualifier)
   (gnu_asm_qualifier)
   "__extension__"
-] @type.qualifier
+] @keyword.modifier
 
 (linkage_specification
-  "extern" @keyword.storage)
+  "extern" @keyword.modifier)
 
 (type_definition
   declarator: (type_identifier) @type.definition)
@@ -232,10 +237,10 @@
   (argument_list
     (identifier) @variable.builtin))
 
-((attribute_specifier
+(attribute_specifier
   (argument_list
     (call_expression
-      function: (identifier) @variable.builtin))))
+      function: (identifier) @variable.builtin)))
 
 ((call_expression
   function: (identifier) @function.builtin)
@@ -258,18 +263,16 @@
   function: (identifier) @function.call)
 
 (call_expression
-  function:
-    (field_expression
-      field: (field_identifier) @function.call))
+  function: (field_expression
+    field: (field_identifier) @function.call))
 
 (function_declarator
   declarator: (identifier) @function)
 
 (function_declarator
-  declarator:
-    (parenthesized_declarator
-      (pointer_declarator
-        declarator: (field_identifier) @function)))
+  declarator: (parenthesized_declarator
+    (pointer_declarator
+      declarator: (field_identifier) @function)))
 
 (preproc_function_def
   name: (identifier) @function.macro)