Merge branch 'nvim-treesitter:main' into main

runtime/queries/c3/highlights.scm

@@ -106,6 +106,7 @@
   "$if"
   "$include"
   "$is_const"
+  "$kindof"
   "$nameof"
   "$offsetof"
   "$qnameof"
@@ -218,6 +219,8 @@
   "&&&"
   "+++"
   "|||"
+  "???"
+  "+++="
 ] @operator
 
 (range_expr
@@ -232,6 +235,7 @@
 (ternary_expr
   [
     "?"
+    "???"
     ":"
   ] @keyword.conditional.ternary)
 
@@ -268,8 +272,8 @@
     (#any-of? @variable.builtin
       "alignof" "associated" "elements" "extnameof" "from_ordinal" "get" "inf" "is_eq" "is_ordered"
       "is_substruct" "len" "lookup" "lookup_field" "max" "membersof" "methodsof" "min" "nan" "inner"
-      "kindof" "names" "nameof" "params" "paramsof" "parentof" "qnameof" "returns" "sizeof" "tagof"
-      "has_tagof" "values" "typeid")))
+      "kindof" "names" "nameof" "params" "paramsof" "parentof" "qnameof" "returns" "sizeof" "set"
+      "tagof" "has_tagof" "values" "typeid")))
 
 ; Label
 [
@@ -285,7 +289,7 @@
   (path_ident
     (ident) @module))
 
-(import_declaration
+(import_path
   (path_ident
     (ident) @module))
 
@@ -298,6 +302,9 @@
 (call_inline_attributes
   (at_ident) @attribute)
 
+(type_suffix
+  (at_ident) @attribute)
+
 (asm_block_stmt
   (at_ident) @attribute)
 

runtime/queries/lua/injections.scm

@@ -34,10 +34,10 @@
     (_)
     .
     (string
-      content: _ @_method)
+      content: (_) @_method)
     .
     (string
-      content: _ @injection.content)))
+      content: (_) @injection.content)))
   (#any-of? @_vimcmd_identifier "vim.rpcrequest" "vim.rpcnotify")
   (#eq? @_method "nvim_exec_lua")
   (#set! injection.language "lua"))

runtime/queries/nix/injections.scm

@@ -48,7 +48,8 @@
       ((string_fragment) @injection.content
         (#set! injection.language "bash")))
   ]
-  (#lua-match? @_path "^%a+Phase$"))
+  (#lua-match? @_path "^%a+Phase$")
+  (#set! injection.combined))
 
 (binding
   attrpath: (attrpath
@@ -61,7 +62,8 @@
       ((string_fragment) @injection.content
         (#set! injection.language "bash")))
   ]
-  (#lua-match? @_path "^pre%a+$"))
+  (#lua-match? @_path "^pre%a+$")
+  (#set! injection.combined))
 
 (binding
   attrpath: (attrpath
@@ -74,7 +76,8 @@
       ((string_fragment) @injection.content
         (#set! injection.language "bash")))
   ]
-  (#lua-match? @_path "^post%a+$"))
+  (#lua-match? @_path "^post%a+$")
+  (#set! injection.combined))
 
 (binding
   attrpath: (attrpath
@@ -87,7 +90,8 @@
       ((string_fragment) @injection.content
         (#set! injection.language "bash")))
   ]
-  (#lua-match? @_path "^script$"))
+  (#lua-match? @_path "^script$")
+  (#set! injection.combined))
 
 (apply_expression
   function: (_) @_func