tsq: Tune highlights to more closely match 24.07 release

The changes in #12148 were a bit radical - this restores some
customizations we had like using "label" for captures and not
highlighting the '#' or '?'/'!' parts differently. Also the highlighting
for predicates we do (not) support has been restored.

runtime/queries/tsq/highlights.scm

@@ -11,11 +11,6 @@
 
 "_" @constant
 
-[
-  "@"
-  "#"
-] @punctuation.special
-
 ":" @punctuation.delimiter
 
 [
@@ -27,8 +22,6 @@
 
 "." @operator
 
-(predicate_type) @punctuation.special
-
 (quantifier) @operator
 
 (comment) @comment
@@ -41,16 +34,16 @@
   name: (identifier) @variable.other.member)
 
 (named_node
-  name: (identifier) @variable)
+  name: (identifier) @tag)
 
-(predicate
+((predicate
-  name: (identifier) @function)
+   "#" @function.builtin
+   name: (identifier) @function.builtin @_name
+   type: (predicate_type) @function.builtin)
+ (#any-of? @_name "eq" "match" "any-of" "not-any-of" "is" "is-not" "not-same-line" "not-kind-eq" "set" "select-adjacent" "strip"))
+(predicate name: (identifier) @error)
 
-(anonymous_node
+(capture) @label
-  (string) @string)
-
-(capture
-  (identifier) @type)
 
 (escape_sequence) @constant.character.escape
 

runtime/queries/tsq/injections.scm

@@ -5,6 +5,6 @@
   name: (identifier) @_name
   parameters:
     (parameters
-      (string) @injection.content))
+      (string (string_content) @injection.content)))
   (#any-of? @_name "match" "not-match")
   (#set! injection.language "regex"))