aboutsummaryrefslogtreecommitdiff
path: root/runtime/queries
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/queries')
-rw-r--r--runtime/queries/bash/highlights.scm4
-rw-r--r--runtime/queries/c-sharp/highlights.scm10
-rw-r--r--runtime/queries/c/highlights.scm6
-rw-r--r--runtime/queries/css/highlights.scm14
-rw-r--r--runtime/queries/elixir/highlights.scm19
-rw-r--r--runtime/queries/go/highlights.scm6
-rw-r--r--runtime/queries/haskell/highlights.scm6
-rw-r--r--runtime/queries/java/highlights.scm11
-rw-r--r--runtime/queries/javascript/highlights.scm4
-rw-r--r--runtime/queries/json/highlights.scm19
-rw-r--r--runtime/queries/julia/highlights.scm12
-rw-r--r--runtime/queries/ledger/highlights.scm4
-rw-r--r--runtime/queries/lua/highlights.scm6
-rw-r--r--runtime/queries/nix/highlights.scm12
-rw-r--r--runtime/queries/ocaml/highlights.scm8
-rw-r--r--runtime/queries/php/highlights.scm12
-rw-r--r--runtime/queries/protobuf/highlights.scm10
-rw-r--r--runtime/queries/python/highlights.scm11
-rw-r--r--runtime/queries/ruby/highlights.scm6
-rw-r--r--runtime/queries/rust/highlights.scm35
-rw-r--r--runtime/queries/svelte/highlights.scm2
-rw-r--r--runtime/queries/toml/highlights.scm8
-rw-r--r--runtime/queries/tsq/highlights.scm4
-rw-r--r--runtime/queries/yaml/highlights.scm10
-rw-r--r--runtime/queries/zig/highlights.scm8
25 files changed, 131 insertions, 116 deletions
diff --git a/runtime/queries/bash/highlights.scm b/runtime/queries/bash/highlights.scm
index 754faeda..57898f27 100644
--- a/runtime/queries/bash/highlights.scm
+++ b/runtime/queries/bash/highlights.scm
@@ -7,7 +7,7 @@
(command_name) @function
-(variable_name) @property
+(variable_name) @variable.other.member
[
"case"
@@ -31,7 +31,7 @@
(function_definition name: (word) @function)
-(file_descriptor) @number
+(file_descriptor) @constant.numeric.integer
[
(command_substitution)
diff --git a/runtime/queries/c-sharp/highlights.scm b/runtime/queries/c-sharp/highlights.scm
index b76f4e60..6e84ad83 100644
--- a/runtime/queries/c-sharp/highlights.scm
+++ b/runtime/queries/c-sharp/highlights.scm
@@ -20,16 +20,16 @@
] @type.builtin
;; Enum
-(enum_member_declaration (identifier) @variable.property)
+(enum_member_declaration (identifier) @variable.other.member)
;; Literals
[
(real_literal)
(integer_literal)
-] @number
+] @constant.numeric.integer
+(character_literal) @constant.character
[
- (character_literal)
(string_literal)
(verbatim_string_literal)
(interpolated_string_text)
@@ -40,8 +40,8 @@
"$@\""
] @string
+(boolean_literal) @constant.builtin.boolean
[
- (boolean_literal)
(null_literal)
(void_keyword)
] @constant.builtin
@@ -98,7 +98,7 @@
;; Keywords
(modifier) @keyword
(this_expression) @keyword
-(escape_sequence) @keyword
+(escape_sequence) @constant.character.escape
[
"as"
diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index 2c42710f..918f3f66 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -60,8 +60,8 @@
(system_lib_string) @string
(null) @constant
-(number_literal) @number
-(char_literal) @string
+(number_literal) @constant.numeric.integer
+(char_literal) @constant.character
(call_expression
function: (identifier) @function)
@@ -73,7 +73,7 @@
(preproc_function_def
name: (identifier) @function.special)
-(field_identifier) @property
+(field_identifier) @variable.other.member
(statement_identifier) @label
(type_identifier) @type
(primitive_type) @type
diff --git a/runtime/queries/css/highlights.scm b/runtime/queries/css/highlights.scm
index 763661af..4dfc0c66 100644
--- a/runtime/queries/css/highlights.scm
+++ b/runtime/queries/css/highlights.scm
@@ -26,11 +26,11 @@
(pseudo_element_selector (tag_name) @attribute)
(pseudo_class_selector (class_name) @attribute)
-(class_name) @property
-(id_name) @property
-(namespace_name) @property
-(property_name) @property
-(feature_name) @property
+(class_name) @variable.other.member
+(id_name) @variable.other.member
+(namespace_name) @variable.other.member
+(property_name) @variable.other.member
+(feature_name) @variable.other.member
(attribute_name) @attribute
@@ -55,8 +55,8 @@
(string_value) @string
(color_value) @string.special
-(integer_value) @number
-(float_value) @number
+(integer_value) @constant.numeric.integer
+(float_value) @constant.numeric.float
(unit) @type
"#" @punctuation.delimiter
diff --git a/runtime/queries/elixir/highlights.scm b/runtime/queries/elixir/highlights.scm
index b7b0cab6..76fd2af9 100644
--- a/runtime/queries/elixir/highlights.scm
+++ b/runtime/queries/elixir/highlights.scm
@@ -39,13 +39,13 @@
; * module attribute
(unary_operator
- operator: "@" @variable.property
+ operator: "@" @variable.other.member
operand: [
- (identifier) @variable.property
+ (identifier) @variable.other.member
(call
- target: (identifier) @variable.property)
- (boolean) @variable.property
- (nil) @variable.property
+ target: (identifier) @variable.other.member)
+ (boolean) @variable.other.member
+ (nil) @variable.other.member
])
; * capture operator
@@ -79,11 +79,8 @@
(nil) @constant.builtin
(boolean) @constant.builtin.boolean
-
-[
- (integer)
- (float)
-] @number
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
(alias) @type
@@ -97,7 +94,7 @@
(interpolation "#{" @punctuation.special "}" @punctuation.special) @embedded
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
[
(atom)
diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index 3129c4b2..56384d4d 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -25,7 +25,7 @@
(variadic_parameter_declaration (identifier) @variable.parameter)
(type_identifier) @type
-(field_identifier) @property
+(field_identifier) @variable.other.member
(identifier) @variable
(package_identifier) @variable
@@ -130,13 +130,13 @@
(rune_literal)
] @string
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
[
(int_literal)
(float_literal)
(imaginary_literal)
-] @number
+] @constant.numeric.integer
[
(true)
diff --git a/runtime/queries/haskell/highlights.scm b/runtime/queries/haskell/highlights.scm
index dada80b6..72187876 100644
--- a/runtime/queries/haskell/highlights.scm
+++ b/runtime/queries/haskell/highlights.scm
@@ -13,9 +13,9 @@
(constraint class: (class_name (type)) @class)
(class (class_head class: (class_name (type)) @class))
(instance (instance_head class: (class_name (type)) @class))
-(integer) @number
-(exp_literal (float)) @number
-(char) @literal
+(integer) @constant.numeric.integer
+(exp_literal (float)) @constant.numeric.float
+(char) @constant.character
(con_unit) @literal
(con_list) @literal
(tycon_arrow) @operator
diff --git a/runtime/queries/java/highlights.scm b/runtime/queries/java/highlights.scm
index e7d793df..77902fce 100644
--- a/runtime/queries/java/highlights.scm
+++ b/runtime/queries/java/highlights.scm
@@ -59,14 +59,15 @@
(hex_integer_literal)
(decimal_integer_literal)
(octal_integer_literal)
+] @constant.numeric.integer
+
+[
(decimal_floating_point_literal)
(hex_floating_point_literal)
-] @number
+] @constant.numeric.float
-[
- (character_literal)
- (string_literal)
-] @string
+(character_literal) @constant.character
+(string_literal) @string
[
(true)
diff --git a/runtime/queries/javascript/highlights.scm b/runtime/queries/javascript/highlights.scm
index e29829bf..6163b680 100644
--- a/runtime/queries/javascript/highlights.scm
+++ b/runtime/queries/javascript/highlights.scm
@@ -65,7 +65,7 @@
; Properties
;-----------
-(property_identifier) @property
+(property_identifier) @variable.other.member
; Literals
;---------
@@ -88,7 +88,7 @@
] @string
(regex) @string.regexp
-(number) @number
+(number) @constant.numeric.integer
; Tokens
;-------
diff --git a/runtime/queries/json/highlights.scm b/runtime/queries/json/highlights.scm
index b08ea439..6df6c9eb 100644
--- a/runtime/queries/json/highlights.scm
+++ b/runtime/queries/json/highlights.scm
@@ -1,9 +1,20 @@
+[
+ (true)
+ (false)
+] @constant.builtin.boolean
+(null) @constant.builtin
+(number) @constant.numeric
(pair
key: (_) @keyword)
(string) @string
+(escape_sequence) @constant.character.escape
+(ERROR) @error
-(object
- "{" @escape
- (_)
- "}" @escape)
+"," @punctuation.delimiter
+[
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
diff --git a/runtime/queries/julia/highlights.scm b/runtime/queries/julia/highlights.scm
index 7b7d426c..7c447985 100644
--- a/runtime/queries/julia/highlights.scm
+++ b/runtime/queries/julia/highlights.scm
@@ -15,7 +15,7 @@
(field_expression
(identifier)
- (identifier) @field .)
+ (identifier) @variable.other.member .)
(function_definition
name: (identifier) @function)
@@ -80,14 +80,14 @@
(struct_definition
name: (identifier) @type)
-(number) @number
+(number) @constant.numeric.integer
(range_expression
- (identifier) @number
- (eq? @number "end"))
+ (identifier) @constant.numeric.integer
+ (eq? @constant.numeric.integer "end"))
(range_expression
(_
- (identifier) @number
- (eq? @number "end")))
+ (identifier) @constant.numeric.integer
+ (eq? @constant.numeric.integer "end")))
(coefficient_expression
(number)
(identifier) @constant.builtin)
diff --git a/runtime/queries/ledger/highlights.scm b/runtime/queries/ledger/highlights.scm
index 86c609c2..bdf5f2db 100644
--- a/runtime/queries/ledger/highlights.scm
+++ b/runtime/queries/ledger/highlights.scm
@@ -7,9 +7,9 @@
(date)
(interval)
(quantity)
-] @number
+] @constant.numeric.integer
-((account) @field)
+((account) @variable.other.member)
((commodity) @text.literal)
"include" @include
diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index 40c2be70..e73b32d6 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -150,14 +150,14 @@
(table ["{" "}"] @constructor)
(comment) @comment
(string) @string
-(number) @number
+(number) @constant.numeric.integer
(label_statement) @label
; A bit of a tricky one, this will only match field names
-(field . (identifier) @property (_))
+(field . (identifier) @variable.other.member (_))
(shebang) @comment
;; Property
-(property_identifier) @property
+(property_identifier) @variable.other.member
;; Variable
(identifier) @variable
diff --git a/runtime/queries/nix/highlights.scm b/runtime/queries/nix/highlights.scm
index 741b73b5..66719e87 100644
--- a/runtime/queries/nix/highlights.scm
+++ b/runtime/queries/nix/highlights.scm
@@ -33,16 +33,14 @@
(uri) @string.special.uri
-[
- (integer)
- (float)
-] @number
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
(interpolation
"${" @punctuation.special
"}" @punctuation.special) @embedded
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
(function
universal: (identifier) @variable.parameter
@@ -66,8 +64,8 @@
(binary
operator: _ @operator)
-(attr_identifier) @property
-(inherit attrs: (attrs_inherited (identifier) @property) )
+(attr_identifier) @variable.other.member
+(inherit attrs: (attrs_inherited (identifier) @variable.other.member) )
[
";"
diff --git a/runtime/queries/ocaml/highlights.scm b/runtime/queries/ocaml/highlights.scm
index 160f2cb4..15f46cc1 100644
--- a/runtime/queries/ocaml/highlights.scm
+++ b/runtime/queries/ocaml/highlights.scm
@@ -51,14 +51,14 @@
; Properties
;-----------
-[(label_name) (field_name) (instance_variable_name)] @property
+[(label_name) (field_name) (instance_variable_name)] @variable.other.member
; Constants
;----------
[(boolean) (unit)] @constant
-[(number) (signed_number)] @number
+[(number) (signed_number)] @constant.numeric.integer
(character) @constant.character
@@ -66,7 +66,7 @@
(quoted_string "{" @string "}" @string) @string
-(escape_sequence) @string.escape
+(escape_sequence) @constant.character.escape
[
(conversion_specification)
@@ -145,7 +145,7 @@
; Attributes
;-----------
-(attribute_id) @property
+(attribute_id) @variable.other.member
; Comments
;---------
diff --git a/runtime/queries/php/highlights.scm b/runtime/queries/php/highlights.scm
index 02904555..46b5d26c 100644
--- a/runtime/queries/php/highlights.scm
+++ b/runtime/queries/php/highlights.scm
@@ -30,12 +30,12 @@
; Member
(property_element
- (variable_name) @property)
+ (variable_name) @variable.other.member)
(member_access_expression
- name: (variable_name (name)) @property)
+ name: (variable_name (name)) @variable.other.member)
(member_access_expression
- name: (name) @property)
+ name: (name) @variable.other.member)
; Variables
@@ -56,10 +56,10 @@
(string) @string
(heredoc) @string
-(boolean) @constant.builtin
+(boolean) @constant.builtin.boolean
(null) @constant.builtin
-(integer) @number
-(float) @number
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
(comment) @comment
"$" @operator
diff --git a/runtime/queries/protobuf/highlights.scm b/runtime/queries/protobuf/highlights.scm
index cd021be1..c35c430e 100644
--- a/runtime/queries/protobuf/highlights.scm
+++ b/runtime/queries/protobuf/highlights.scm
@@ -34,16 +34,14 @@
[
(fieldName)
(optionName)
-] @property
+] @variable.other.member
(enumVariantName) @type.enum.variant
(fullIdent) @namespace
-[
- (intLit)
- (floatLit)
-] @number
-(boolLit) @constant.builtin
+(intLit) @constant.numeric.integer
+(floatLit) @constant.numeric.float
+(boolLit) @constant.builtin.boolean
(strLit) @string
(constant) @constant
diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index f64fecb2..9131acc5 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -29,7 +29,7 @@
name: (identifier) @function)
(identifier) @variable
-(attribute attribute: (identifier) @property)
+(attribute attribute: (identifier) @variable.other.member)
(type (identifier) @type)
; Literals
@@ -40,14 +40,11 @@
(false)
] @constant.builtin
-[
- (integer)
- (float)
-] @number
-
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
(comment) @comment
(string) @string
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
(interpolation
"{" @punctuation.special
diff --git a/runtime/queries/ruby/highlights.scm b/runtime/queries/ruby/highlights.scm
index 8617d6f0..898f8f79 100644
--- a/runtime/queries/ruby/highlights.scm
+++ b/runtime/queries/ruby/highlights.scm
@@ -55,7 +55,7 @@
[
(class_variable)
(instance_variable)
-] @property
+] @variable.other.member
((identifier) @constant.builtin
(#match? @constant.builtin "^__(FILE|LINE|ENCODING)__$"))
@@ -101,12 +101,12 @@
] @string.special.symbol
(regex) @string.regexp
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
[
(integer)
(float)
-] @number
+] @constant.numeric.integer
[
(nil)
diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 956a5dac..539d9550 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -15,15 +15,13 @@
; Primitives
; ---
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
(primitive_type) @type.builtin
(boolean_literal) @constant.builtin.boolean
+(integer_literal) @constant.numeric.integer
+(float_literal) @constant.numeric.float
+(char_literal) @constant.character
[
- (integer_literal)
- (float_literal)
-] @number
-[
- (char_literal)
(string_literal)
(raw_string_literal)
] @string
@@ -40,10 +38,10 @@
(enum_variant (identifier) @type.enum.variant)
(field_initializer
- (field_identifier) @property)
+ (field_identifier) @variable.other.member)
(shorthand_field_initializer
- (identifier) @variable.property)
-(shorthand_field_identifier) @variable.property
+ (identifier) @variable.other.member)
+(shorthand_field_identifier) @variable.other.member
(lifetime
"'" @label
@@ -81,9 +79,24 @@
] @punctuation.bracket)
; ---
-; Parameters
+; Variables
; ---
+(let_declaration
+ pattern: [
+ ((identifier) @variable)
+ ((tuple_pattern
+ (identifier) @variable))
+ ])
+
+; It needs to be anonymous to not conflict with `call_expression` further below.
+(_
+ value: (field_expression
+ value: (identifier)? @variable
+ field: (field_identifier) @variable.other.member))
+
+(arguments
+ (identifier) @variable.parameter)
(parameter
pattern: (identifier) @variable.parameter)
(closure_parameters
@@ -336,4 +349,4 @@
(type_identifier) @type
(identifier) @variable
-(field_identifier) @property
+(field_identifier) @variable.other.member
diff --git a/runtime/queries/svelte/highlights.scm b/runtime/queries/svelte/highlights.scm
index 4c6f5f35..4fcdfd66 100644
--- a/runtime/queries/svelte/highlights.scm
+++ b/runtime/queries/svelte/highlights.scm
@@ -29,7 +29,7 @@
(#match? @_attr "^(href|src)$"))
(tag_name) @tag
-(attribute_name) @property
+(attribute_name) @variable.other.member
(erroneous_end_tag_name) @error
(comment) @comment
diff --git a/runtime/queries/toml/highlights.scm b/runtime/queries/toml/highlights.scm
index e4d6966f..2742b2be 100644
--- a/runtime/queries/toml/highlights.scm
+++ b/runtime/queries/toml/highlights.scm
@@ -1,17 +1,17 @@
; Properties
;-----------
-(bare_key) @property
+(bare_key) @variable.other.member
(quoted_key) @string
; Literals
;---------
-(boolean) @constant.builtin
+(boolean) @constant.builtin.boolean
(comment) @comment
(string) @string
-(integer) @number
-(float) @number
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
(offset_date_time) @string.special
(local_date_time) @string.special
(local_date) @string.special
diff --git a/runtime/queries/tsq/highlights.scm b/runtime/queries/tsq/highlights.scm
index 9ba5699a..549895c1 100644
--- a/runtime/queries/tsq/highlights.scm
+++ b/runtime/queries/tsq/highlights.scm
@@ -35,12 +35,12 @@
(comment) @comment
-(field_name) @property
+(field_name) @variable.other.member
(capture) @label
(predicate_name) @function
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
(node_name) @variable
diff --git a/runtime/queries/yaml/highlights.scm b/runtime/queries/yaml/highlights.scm
index 2955a4ce..a7efb5e7 100644
--- a/runtime/queries/yaml/highlights.scm
+++ b/runtime/queries/yaml/highlights.scm
@@ -1,12 +1,12 @@
-(block_mapping_pair key: (_) @property)
-(flow_mapping (_ key: (_) @property))
+(block_mapping_pair key: (_) @variable.other.member)
+(flow_mapping (_ key: (_) @variable.other.member))
(boolean_scalar) @constant.builtin.boolean
(null_scalar) @constant.builtin
(double_quote_scalar) @string
(single_quote_scalar) @string
-(escape_sequence) @string.escape
-(integer_scalar) @number
-(float_scalar) @number
+(escape_sequence) @constant.character.escape
+(integer_scalar) @constant.numeric.integer
+(float_scalar) @constant.numeric.float
(comment) @comment
(anchor_name) @type
(alias_name) @type
diff --git a/runtime/queries/zig/highlights.scm b/runtime/queries/zig/highlights.scm
index 404a8682..34dbeacd 100644
--- a/runtime/queries/zig/highlights.scm
+++ b/runtime/queries/zig/highlights.scm
@@ -14,7 +14,7 @@ parameter: (IDENTIFIER) @variable.parameter
[
field_member: (IDENTIFIER)
field_access: (IDENTIFIER)
-] @variable.property
+] @variable.other.member
;; assume TitleCase is a type
(
@@ -75,9 +75,9 @@ field_constant: (IDENTIFIER) @constant
((BUILTINIDENTIFIER) @keyword.control.import
(#any-of? @keyword.control.import "@import" "@cImport"))
-(INTEGER) @number
+(INTEGER) @constant.numeric.integer
-(FLOAT) @number
+(FLOAT) @constant.numeric.float
[
(LINESTRING)
@@ -85,7 +85,7 @@ field_constant: (IDENTIFIER) @constant
] @string
(CHAR_LITERAL) @constant.character
-(EscapeSequence) @escape
+(EscapeSequence) @constant.character.escape
(FormatSequence) @string.special
[