kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

fix: Rust highlights (regression from the reverse-query-precedence PR) (#12795)

Browse source 
Co-authored-by: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
This commit is contained in:
Nikita Revenco 2025-02-07 14:51:22 +00:00 • committed by GitHub
parent c36ed6ad92
commit 1b89f998e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 106 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
runtime/queries/haskell/highlights.scm
View file

@ -256,8 +256,6 @@
) )
(con_unit) @constant.builtin ; unit, as in ()
(comment) @comment (comment) @comment

205
runtime/queries/rust/highlights.scm
View file

@ -75,16 +75,6 @@
path: (identifier)? @namespace path: (identifier)? @namespace
alias: (identifier) @namespace) alias: (identifier) @namespace)
; ---
; Remaining Paths
; ---
(scoped_identifier
path: (identifier)? @namespace
name: (identifier) @namespace)
(scoped_type_identifier
path: (identifier) @namespace)
; ------- ; -------
; Types ; Types
; ------- ; -------
@ -97,6 +87,8 @@
name: (type_identifier) @type.parameter) name: (type_identifier) @type.parameter)
((type_arguments (type_identifier) @constant) ((type_arguments (type_identifier) @constant)
(#match? @constant "^[A-Z_]+$")) (#match? @constant "^[A-Z_]+$"))
(type_arguments (type_identifier) @type)
(tuple_struct_pattern "_" @comment.unused)
((type_arguments (type_identifier) @comment.unused) ((type_arguments (type_identifier) @comment.unused)
(#eq? @comment.unused "_")) (#eq? @comment.unused "_"))
@ -126,7 +118,6 @@
; --- ; ---
(self) @variable.builtin (self) @variable.builtin
(enum_variant (identifier) @type.enum.variant)
(field_initializer (field_initializer
(field_identifier) @variable.other.member) (field_identifier) @variable.other.member)
@ -141,63 +132,6 @@
"'" @label "'" @label
(identifier) @label) (identifier) @label)
; ---
; Prelude
; ---
((identifier) @type.enum.variant.builtin
(#any-of? @type.enum.variant.builtin "Some" "None" "Ok" "Err"))
(call_expression
(identifier) @function.builtin
(#any-of? @function.builtin
"drop"
"size_of"
"size_of_val"
"align_of"
"align_of_val"))
((type_identifier) @type.builtin
(#any-of?
@type.builtin
"Send"
"Sized"
"Sync"
"Unpin"
"Drop"
"Fn"
"FnMut"
"FnOnce"
"AsMut"
"AsRef"
"From"
"Into"
"DoubleEndedIterator"
"ExactSizeIterator"
"Extend"
"IntoIterator"
"Iterator"
"Option"
"Result"
"Clone"
"Copy"
"Debug"
"Default"
"Eq"
"Hash"
"Ord"
"PartialEq"
"PartialOrd"
"ToOwned"
"Box"
"String"
"ToString"
"Vec"
"FromIterator"
"TryFrom"
"TryInto"))
; --- ; ---
; Punctuation ; Punctuation
; --- ; ---
@ -229,8 +163,10 @@
"<" "<"
">" ">"
] @punctuation.bracket) ] @punctuation.bracket)
(for_lifetimes ["<" ">"] @punctuation.bracket)
(closure_parameters (closure_parameters
"|" @punctuation.bracket) "|" @punctuation.bracket)
(bracketed_type ["<" ">"] @punctuation.bracket)
; --- ; ---
; Variables ; Variables
@ -339,32 +275,15 @@
; TODO: variable.mut to highlight mutable identifiers via locals.scm ; TODO: variable.mut to highlight mutable identifiers via locals.scm
; ------- ; ---
; Constructors ; Remaining Paths
; ------- ; ---
; TODO: this is largely guesswork, remove it once we get actual info from locals.scm or r-a
(struct_expression (scoped_identifier
name: (type_identifier) @constructor) path: (identifier)? @namespace
name: (identifier) @namespace)
(tuple_struct_pattern (scoped_type_identifier
type: [ path: (identifier) @namespace)
(identifier) @constructor
(scoped_identifier
name: (identifier) @constructor)
])
(struct_pattern
type: [
((type_identifier) @constructor)
(scoped_type_identifier
name: (type_identifier) @constructor)
])
(match_pattern
((identifier) @constructor) (#match? @constructor "^[A-Z]"))
(or_pattern
((identifier) @constructor)
((identifier) @constructor)
(#match? @constructor "^[A-Z]"))
; ------- ; -------
; Functions ; Functions
@ -436,18 +355,43 @@
(#match? @type "^[A-Z]") (#match? @type "^[A-Z]")
(#match? @constructor "^[A-Z]"))) (#match? @constructor "^[A-Z]")))
(enum_variant (identifier) @type.enum.variant)
; -------
; Constructors
; -------
; TODO: this is largely guesswork, remove it once we get actual info from locals.scm or r-a
(struct_expression
name: (type_identifier) @constructor)
(tuple_struct_pattern
type: [
(identifier) @constructor
(scoped_identifier
name: (identifier) @constructor)
])
(struct_pattern
type: [
((type_identifier) @constructor)
(scoped_type_identifier
name: (type_identifier) @constructor)
])
(match_pattern
((identifier) @constructor) (#match? @constructor "^[A-Z]"))
(or_pattern
((identifier) @constructor)
((identifier) @constructor)
(#match? @constructor "^[A-Z]"))
; --- ; ---
; Macros ; Macros
; --- ; ---
(attribute
(identifier) @special
arguments: (token_tree (identifier) @type)
(#eq? @special "derive")
)
(attribute (attribute
(identifier) @function.macro) (identifier) @function.macro)
(inner_attribute_item "!" @punctuation)
(attribute (attribute
[ [
(identifier) @function.macro (identifier) @function.macro
@ -470,3 +414,66 @@
(metavariable) @variable.parameter (metavariable) @variable.parameter
(fragment_specifier) @type (fragment_specifier) @type
(attribute
(identifier) @special
arguments: (token_tree (identifier) @type)
(#eq? @special "derive")
)
; ---
; Prelude
; ---
((identifier) @type.enum.variant.builtin
(#any-of? @type.enum.variant.builtin "Some" "None" "Ok" "Err"))
(call_expression
(identifier) @function.builtin
(#any-of? @function.builtin
"drop"
"size_of"
"size_of_val"
"align_of"
"align_of_val"))
((type_identifier) @type.builtin
(#any-of?
@type.builtin
"Send"
"Sized"
"Sync"
"Unpin"
"Drop"
"Fn"
"FnMut"
"FnOnce"
"AsMut"
"AsRef"
"From"
"Into"
"DoubleEndedIterator"
"ExactSizeIterator"
"Extend"
"IntoIterator"
"Iterator"
"Option"
"Result"
"Clone"
"Copy"
"Debug"
"Default"
"Eq"
"Hash"
"Ord"
"PartialEq"
"PartialOrd"
"ToOwned"
"Box"
"String"
"ToString"
"Vec"
"FromIterator"
"TryFrom"
"TryInto"))