fix(highlights): improve consistency

22 files changed, 62 insertions, 76 deletions

diff --git a/queries/ada/highlights.scm b/queries/ada/highlights.scm
index c15c4d9e3..c024afb4e 100644
--- a/queries/ada/highlights.scm
+++ b/queries/ada/highlights.scm
@@ -13,6 +13,7 @@
   "array"
   "at"
   "begin"
+  "body"
   "declare"
   "delay"
   "delta"
@@ -25,17 +26,26 @@
   "interface"
   "is"
   "limited"
+  "mod"
+  "new"
   "null"
   "of"
   "others"
   "out"
+  "overriding"
+  "package"
   "pragma"
   "private"
+  "protected"
   "range"
+  "record"
+  "separate"
+  "subtype"
   "synchronized"
   "tagged"
   "task"
   "terminate"
+  "type"
   "until"
   "when"
 ] @keyword
@@ -47,26 +57,13 @@
 ] @keyword.storage
 
 [
-  "mod"
-  "new"
-  "protected"
-  "record"
-  "subtype"
-  "type"
-] @keyword.type
-
-[
   "with"
   "use"
 ] @keyword.import
 
 [
-  "body"
   "function"
-  "overriding"
   "procedure"
-  "package"
-  "separate"
 ] @keyword.function
 
 [
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 64ff9168c..2cddf4684 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -256,4 +256,4 @@
   "inherited_sharing"
 ] @keyword
 
-"System.runAs" @type.builtin
+"System.runAs" @function.builtin
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index e555e40d7..6661db838 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -266,10 +266,7 @@
 ] @boolean
 
 ((python_identifier) @variable.builtin
-  (#eq? @variable.builtin "self"))
-
-((python_identifier) @variable.builtin
-  (#eq? @variable.builtin "cls"))
+  (#any-of? @variable.builtin "self" "cls"))
 
 (integer) @number
 
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index 714893cb1..5a3875908 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -25,7 +25,7 @@
 [
   "ENV"
   "CACHE"
-] @keyword.storage
+] @module
 
 [
   "$"
diff --git a/queries/dot/highlights.scm b/queries/dot/highlights.scm
index 7919e87f5..b4a36f18d 100644
--- a/queries/dot/highlights.scm
+++ b/queries/dot/highlights.scm
@@ -47,8 +47,6 @@
     (id
       (identifier) @constant))
 
-(comment) @comment
+(comment) @comment @spell
 
 (preproc) @keyword.directive
-
-(comment) @spell
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 57e299b17..4f1057f48 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -31,7 +31,7 @@
 (string) @string
 
 ; Modules
-(alias) @type
+(alias) @module
 
 ; Atoms & Keywords
 [
diff --git a/queries/elvish/highlights.scm b/queries/elvish/highlights.scm
index a2fd9302c..d0a74c226 100644
--- a/queries/elvish/highlights.scm
+++ b/queries/elvish/highlights.scm
@@ -128,7 +128,7 @@
 
 ((variable
   (identifier) @function)
-  (#match? @function ".+\\~$"))
+  (#lua-match? @function ".+[~]$"))
 
 ((variable
   (identifier) @boolean)
diff --git a/queries/git_config/highlights.scm b/queries/git_config/highlights.scm
index ebae70e51..5830c1b56 100644
--- a/queries/git_config/highlights.scm
+++ b/queries/git_config/highlights.scm
@@ -37,6 +37,16 @@
     (subsection_name)
   ] @string.special)
 
+((section_header
+  (section_name) @_name
+  (subsection_name) @string.special.url)
+  (#any-of? @_name "credential" "url"))
+
+((variable
+  (name) @_name
+  value: (string) @string.special.url)
+  (#eq? @_name "insteadOf"))
+
 ; Punctuation
 [
   "["
diff --git a/queries/http/highlights.scm b/queries/http/highlights.scm
index d1396ff63..a9c4dc079 100644
--- a/queries/http/highlights.scm
+++ b/queries/http/highlights.scm
@@ -1,5 +1,5 @@
-; Keywords
-(scheme) @keyword
+; Schemes
+(scheme) @type
 
 ; Methods
 (method) @function.method
diff --git a/queries/hurl/highlights.scm b/queries/hurl/highlights.scm
index 9ccaa2ee7..7dd08ec64 100644
--- a/queries/hurl/highlights.scm
+++ b/queries/hurl/highlights.scm
@@ -52,12 +52,13 @@
   "retry"
   "retry-interval"
   "retry-max-count"
-  (variable_option
-    "variable")
   "verbose"
   "very-verbose"
 ] @constant.builtin
 
+(variable_option
+  "variable" @constant.builtin)
+
 (boolean) @boolean
 
 (variable_name) @variable
diff --git a/queries/mlir/highlights.scm b/queries/mlir/highlights.scm
index cbe4ecf0d..6c2b8d0d9 100644
--- a/queries/mlir/highlights.scm
+++ b/queries/mlir/highlights.scm
@@ -340,7 +340,7 @@
 (block_arg_list
   (value_use) @variable.parameter)
 
-(caret_id) @tag
+(caret_id) @string.special
 
 (value_use) @variable
 
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index 99151efdc..ee6127650 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -314,5 +314,6 @@
   (comment)
   (line_number_directive)
   (directive)
-  (shebang)
 ] @comment @spell
+
+(shebang) @keyword.directive
diff --git a/queries/proto/highlights.scm b/queries/proto/highlights.scm
index 102d5c20b..6324ae3bb 100644
--- a/queries/proto/highlights.scm
+++ b/queries/proto/highlights.scm
@@ -39,11 +39,12 @@
 (enum_field
   (identifier) @constant)
 
+(string) @string
+
 [
-  (string)
   "\"proto3\""
   "\"proto2\""
-] @string
+] @string.special
 
 (int_lit) @number
 
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 6b8bb591c..8116a503e 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -125,7 +125,7 @@
 ] @label
 
 ((identifier) @constant.builtin
-  (#match? @constant.builtin "^__(callee|dir|id|method|send|ENCODING|FILE|LINE)__$"))
+  (#any-of? @constant.builtin "__callee__" "__dir__" "__id__" "__method__" "__send__" "__ENCODING__" "__FILE__" "__LINE__"))
 
 ((constant) @type
   (#not-lua-match? @type "^[A-Z0-9_]+$"))
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index e4d219f40..5b4ee7b1b 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -150,10 +150,11 @@
 
 [
   (string)
-  (character_literal)
   (interpolated_string_expression)
 ] @string
 
+(character_literal) @character
+
 (symbol_literal) @string.special.symbol
 
 (interpolation
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index f1d56dbca..2771a1452 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -71,10 +71,9 @@
 "constructor" @constructor
 
 ; Fields
-[
-  (field_identifier)
-  (annotation_key)
-] @variable.member
+(field_identifier) @variable.member
+
+(annotation_key) @attribute
 
 ((field_identifier) @constant
   (#lua-match? @constant "^[%u_]*$"))
diff --git a/queries/supercollider/highlights.scm b/queries/supercollider/highlights.scm
index c8dbd70c7..c56bce69a 100644
--- a/queries/supercollider/highlights.scm
+++ b/queries/supercollider/highlights.scm
@@ -25,11 +25,11 @@
 
 ; For function calls
 (named_argument
-  name: (identifier) @property)
+  name: (identifier) @function.call)
 
 ; Methods
 (method_call
-  name: (method_name) @function.method)
+  name: (method_name) @function.method.call)
 
 ; Classes
 (class) @type
diff --git a/queries/teal/highlights.scm b/queries/teal/highlights.scm
index f74714290..8f5be2725 100644
--- a/queries/teal/highlights.scm
+++ b/queries/teal/highlights.scm
@@ -237,21 +237,3 @@
   "{"
   "}"
 ] @punctuation.bracket
-
-; Only highlight format specifiers in calls to string.format
-; string.format('...')
-;(function_call
-;  called_object: (index
-;    (identifier) @base
-;    key: (identifier) @entry)
-;  arguments: (arguments .
-;    (string (format_specifier) @string.escape))
-;
-;  (#eq? @base "string")
-;  (#eq? @entry "format"))
-; ('...'):format()
-;(function_call
-;  called_object: (method_index
-;    (string (format_specifier) @string.escape)
-;    key: (identifier) @func-name)
-;    (#eq? @func-name "format"))
diff --git a/queries/tlaplus/highlights.scm b/queries/tlaplus/highlights.scm
index be4b24581..c98e63f6b 100644
--- a/queries/tlaplus/highlights.scm
+++ b/queries/tlaplus/highlights.scm
@@ -1,7 +1,3 @@
-; ; Intended for consumption by nvim-treesitter
-; ; Default capture names for nvim-treesitter found here:
-; ; https://github.com/nvim-treesitter/nvim-treesitter/blob/e473630fe0872cb0ed97cd7085e724aa58bc1c84/lua/nvim-treesitter/highlight.lua#L14-L104
-; ; In this file, captures defined later take precedence over captures defined earlier
 ; Keywords
 [
   "ACTION"
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index 61c1e5974..e4f318ec8 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -1,6 +1,7 @@
 ; Keywords
 [
-  ; block delimiters
+  "begin"
+  "end"
   (module_keyword)
   "endmodule"
   "program"
@@ -49,11 +50,6 @@
 "return" @keyword.return
 
 [
-  "begin"
-  "end"
-] @label
-
-[
   (always_keyword)
   "generate"
   "for"
@@ -144,7 +140,7 @@
 
 (edge_identifier) @attribute
 
-(port_direction) @label
+(port_direction) @keyword.storage
 
 (port_identifier
   (simple_identifier) @variable)
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index 2fb7268e7..6063dc152 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -82,12 +82,19 @@
   "as"
   "bring"
   "class"
-  "else"
-  "for"
-  "if"
-  "in"
   "let"
   "new"
-  "return"
   (inflight_specifier)
 ] @keyword
+
+[
+  "for"
+  "in"
+] @keyword.repeat
+
+[
+  "if"
+  "else"
+] @keyword.conditional
+
+"return" @keyword.return
diff --git a/queries/yang/highlights.scm b/queries/yang/highlights.scm
index 133f99beb..40891fbea 100644
--- a/queries/yang/highlights.scm
+++ b/queries/yang/highlights.scm
@@ -51,8 +51,8 @@
 
 (keypath) @string.special.path
 
-; Always highlight the value of an enum statement as a string
-(enum_value) @string
+; Always highlight the value of an enum statement as a constant
+(enum_value) @constant
 
 ; Highlight xpath and pattern strings differently from plain strings
 (statement