ci: fix wrong queries

10 files changed, 22 insertions, 23 deletions

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 659319fbe..892546fc2 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -96,12 +96,12 @@
   destination: (word) @parameter)
 
 
-("$" (variable_name)) @identifier
+("$" (variable_name)) @variable
 
 (expansion
   [ "${" "}" ] @punctuation.bracket)
 
-(variable_name) @identifier
+(variable_name) @variable
 
 (case_item
   value: (word) @parameter)
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 38bb7f2fd..0b727c3ad 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -124,6 +124,6 @@
 
 ; Annotations (not fully supported by parser)
 
-((ERROR) @annotation 
-         (vim-match? @annotation  "\[?\[.*\]\]?.*$"))
-(attribute) @annotation
+((ERROR) @attribute
+         (vim-match? @attribute  "\[?\[.*\]\]?.*$"))
+(attribute) @attribute
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index 1f20857c8..9ea563f4d 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -8,9 +8,9 @@
 
 ; Annotations
 (annotation
-  name: (identifier) @annotation)
+  name: (identifier) @attribute)
 (marker_annotation
-  name: (identifier) @annotation)
+  name: (identifier) @attribute)
 
 ; Operators and Tokens
 
@@ -123,7 +123,7 @@
     name: (identifier) @parameter)
 
 (named_argument
-  (label (identifier) @variable.parameter))
+  (label (identifier) @parameter))
 
 ; Literals
 
@@ -136,7 +136,7 @@
     ; (hex_floating_point_literal)
 ] @number
 
-(symbol_literal) @string.special.symbol
+(symbol_literal) @string.special
 (string_literal) @string
 (true) @boolean
 (false) @boolean
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index a8473f06a..880fff07f 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -121,7 +121,7 @@
 (interpreted_string_literal) @string
 (raw_string_literal) @string
 (rune_literal) @string
-(escape_sequence) @escape
+(escape_sequence) @string.escape
 
 (int_literal) @number
 (float_literal) @float
diff --git a/queries/go/locals.scm b/queries/go/locals.scm
index 0ee2c037c..f4b990a6f 100644
--- a/queries/go/locals.scm
+++ b/queries/go/locals.scm
@@ -41,24 +41,24 @@
 
 ;; Call references
 ((call_expression
-   function: (identifier) @reference) @call
+   function: (identifier) @reference)
  (set! reference.kind "call" ))
 
 ((call_expression
     function: (selector_expression
-                field: (field_identifier) @reference)) @call
+                field: (field_identifier) @reference))
  (set! reference.kind "call" ))
 
 
 ((call_expression
     function: (parenthesized_expression
-                (identifier) @reference)) @call
+                (identifier) @reference))
  (set! reference.kind "call" ))
 
 ((call_expression
    function: (parenthesized_expression
                (selector_expression
-                 field: (field_identifier) @reference))) @call
+                 field: (field_identifier) @reference)))
  (set! reference.kind "call" ))
 
 ;; Scopes
diff --git a/queries/java/locals.scm b/queries/java/locals.scm
index 6290334b7..961c18d85 100644
--- a/queries/java/locals.scm
+++ b/queries/java/locals.scm
@@ -35,15 +35,14 @@
 ; Functions
 
 (constructor_declaration) @scope
-(method_declaration
-  name: (identifier) @definition.scope) @scope
+(method_declaration) @scope
 
 
 ; DEFINITIONS
 (package_declaration
   (identifier) @definition.namespace)
 (class_declaration
-  name: (identifier) @definition.class)
+  name: (identifier) @definition.type)
 (enum_declaration
   name: (identifier) @definition.enum)
 (method_declaration
diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index 339f9d115..f01374b59 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -9,4 +9,4 @@
 (jsx_opening_element name: (identifier) @variable.builtin)
 (jsx_self_closing_element name: (identifier) @variable.builtin)
 
-(jsx_text) @none
+(jsx_text) @Normal
diff --git a/queries/php/locals.scm b/queries/php/locals.scm
index da8ef6845..4b8d7abc9 100644
--- a/queries/php/locals.scm
+++ b/queries/php/locals.scm
@@ -32,10 +32,10 @@
 
 (namespace_use_clause
   (qualified_name
-    (name) @definition.class))
+    (name) @definition.type))
 
 (class_declaration
-  name: (name) @definition.class)
+  name: (name) @definition.type)
 
 ; References
 ;------------
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 3ed34c655..e991e28d3 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -67,11 +67,11 @@
     (identifier) @type)) ; type subscript: Tuple[int]
 
 ((call
-  function: (identifier) @isinstance
+  function: (identifier) @_isinstance
   arguments: (argument_list
     (_)
     (identifier) @type))
- (#eq? @isinstance "isinstance"))
+ (#eq? @_isinstance "isinstance"))
 
 ; Normal parameters
 (parameters
diff --git a/queries/regex/highlights.scm b/queries/regex/highlights.scm
index 48242543f..7029aac07 100644
--- a/queries/regex/highlights.scm
+++ b/queries/regex/highlights.scm
@@ -24,6 +24,6 @@
  (end_assertion)
  (boundary_assertion)
  (non_boundary_assertion)
-] @escape
+] @string.escape
 
 [ "*" "+" "|" "=" "<=" "!" "<!" ] @operator