Update queries

- Don't use the old form for predicates
- Update some invalid queries

7 files changed, 19 insertions, 19 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index be75a7b5..46cbd56d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -229,7 +229,7 @@ doSomething(); // Should point to the declaration as the definition
 ```scheme
 (function_declaration
   ((identifier) @definition.var)
-   (set! "definition.var.scope" "parent"))
+   (#set! "definition.var.scope" "parent"))
 ```
 
 Possible scope values are:
diff --git a/queries/java/locals.scm b/queries/java/locals.scm
index 45aec390..a7a62428 100644
--- a/queries/java/locals.scm
+++ b/queries/java/locals.scm
@@ -66,7 +66,7 @@
 
 ((scoped_identifier
   (identifier) @definition.import)
- (has-ancestor? @definition.import import_declaration))
+ (#has-ancestor? @definition.import import_declaration))
 
 (field_declaration
   declarator: (variable_declarator
@@ -74,5 +74,4 @@
 
 ; REFERENCES
 (identifier) @reference
-((type_identifier) @reference
- (set! reference.kind "type"))
+(type_identifier) @reference
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 85129843..c1295622 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -3,7 +3,7 @@
 ;((identifier) @type ; exception: mark `A_foo` sort of identifiers as variables
   ;(match? @type "^[A-Z][^_]"))
 ((identifier) @constant
-  (match? @constant "^[A-Z][A-Z_]{2}[A-Z_]*$"))
+  (#match? @constant "^[A-Z][A-Z_]{2}[A-Z_]*$"))
 
 [
   (triple_string)
@@ -89,11 +89,11 @@
 (number) @number
 (range_expression
     (identifier) @number
-      (eq? @number "end"))
+      (#eq? @number "end"))
 (range_expression
   (_
     (identifier) @number
-      (eq? @number "end")))
+      (#eq? @number "end")))
 (coefficient_expression
   (number)
   (identifier) @constant.builtin)
@@ -173,9 +173,9 @@
 
 ((identifier) @include (#eq? @include "baremodule"))
 
-(((identifier) @constant.builtin) (match? @constant.builtin "^(nothing|Inf|NaN)$"))
-(((identifier) @boolean) (eq? @boolean "true"))
-(((identifier) @boolean) (eq? @boolean "false"))
+(((identifier) @constant.builtin) (#match? @constant.builtin "^(nothing|Inf|NaN)$"))
+(((identifier) @boolean) (#eq? @boolean "true"))
+(((identifier) @boolean) (#eq? @boolean "false"))
 
 ["::" ":" "." "," "..." "!"] @punctuation.delimiter
 ["[" "]" "(" ")" "{" "}"] @punctuation.bracket
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 533233e4..0813c960 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -75,7 +75,7 @@
 
 ((call
   function: (identifier) @function.builtin)
- (any-of? @function.builtin
+ (#any-of? @function.builtin
           "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod"
           "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "filter" "float" "format"
           "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass"
diff --git a/queries/ruby/locals.scm b/queries/ruby/locals.scm
index fe85bf20..dacc4699 100644
--- a/queries/ruby/locals.scm
+++ b/queries/ruby/locals.scm
@@ -21,8 +21,7 @@
 ; SOFTWARE.
 
 ;;; DECLARATIONS AND SCOPES
-((method) @scope
- (set! scope-inherits false))
+(method) @scope
 (class) @scope
 
 [
@@ -49,7 +48,7 @@
 (block_parameter name: (identifier) @definition.var)
 (keyword_parameter name: (identifier) @definition.var)
 
-(assignment left: (_lhs) @definition.var)
+(assignment left: (_) @definition.var)
 
 (left_assignment_list (identifier) @definition.var)
 (rest_assignment (identifier) @definition.var)
diff --git a/queries/sparql/locals.scm b/queries/sparql/locals.scm
index 3a3d3187..107aaeb7 100644
--- a/queries/sparql/locals.scm
+++ b/queries/sparql/locals.scm
@@ -1,6 +1,8 @@
 (group_graph_pattern (triples_block) @scope)
 
-(sub_select (select_clause (var) @definition.var)(set! "definition.var.scope" "parent"))
-(select_query (select_clause (var) @definition.var)(set! "definition.var.scope" "parent"))
+((sub_select (select_clause (var) @definition.var))
+ (#set! "definition.var.scope" "parent"))
+((select_query (select_clause (var) @definition.var))
+ (#set! "definition.var.scope" "parent"))
 
 (var) @reference
diff --git a/queries/supercollider/locals.scm b/queries/supercollider/locals.scm
index 25cd19b7..f2238b47 100644
--- a/queries/supercollider/locals.scm
+++ b/queries/supercollider/locals.scm
@@ -9,7 +9,7 @@
 ; Definitions
 (argument 
 	name: (identifier) @definition.parameter
-	(set! "definition.var.scope" "local")
+	(#set! "definition.var.scope" "local")
 ) 
 
 (variable_definition 
@@ -18,10 +18,10 @@
 
 (variable_definition 
 	name: (variable (environment_var (identifier) @definition.var))
-	(set! "definition.var.scope" "global"))
+	(#set! "definition.var.scope" "global"))
 
 (function_definition name: (variable) @definition.var
-	 (set! "definition.var.scope" "parent")
+	 (#set! "definition.var.scope" "parent")
 )
 
 (identifier) @reference