procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rust-ts-mode: Highlight variable reassignments

Browse source 
* lisp/progmodes/rust-ts-mode.el (rust-ts-mode):
New treesit font-lock feature: 'assignment' (bug#61302).
(rust-ts-mode--fontify-pattern): Remove the node lookup step.
(rust-ts-mode--font-lock-settings): Update variable declaration
queries to match the 'pattern' child node right away.  Add
highlights for 'assignment.
This commit is contained in:
Dmitry Gutov 2023-02-14 19:29:30 +02:00
parent 5206a551c1
commit 477aa047ee
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lisp/progmodes/rust-ts-mode.el
View file

@ -163,11 +163,16 @@
(macro_definition "macro_rules!" @font-lock-constant-face) (macro_definition "macro_rules!" @font-lock-constant-face)
(macro_definition (identifier) @font-lock-preprocessor-face) (macro_definition (identifier) @font-lock-preprocessor-face)
(field_declaration name: (field_identifier) @font-lock-property-face) (field_declaration name: (field_identifier) @font-lock-property-face)
(parameter) @rust-ts-mode--fontify-pattern (parameter pattern: (_) @rust-ts-mode--fontify-pattern)
(let_declaration) @rust-ts-mode--fontify-pattern (let_declaration pattern: (_) @rust-ts-mode--fontify-pattern)
(for_expression) @rust-ts-mode--fontify-pattern (for_expression pattern: (_) @rust-ts-mode--fontify-pattern)
(let_condition) @rust-ts-mode--fontify-pattern (let_condition pattern: (_) @rust-ts-mode--fontify-pattern)
(match_arm) @rust-ts-mode--fontify-pattern) (match_arm pattern: (_) @rust-ts-mode--fontify-pattern))
:language 'rust
:feature 'assignment
'((assignment_expression left: (_) @rust-ts-mode--fontify-pattern)
(compound_assignment_expr left: (_) @rust-ts-mode--fontify-pattern))
:language 'rust :language 'rust
:feature 'function :feature 'function
@ -261,7 +266,7 @@
(treesit-available-p) (treesit-available-p)
`(lambda (node override start end &rest _) `(lambda (node override start end &rest _)
(let ((captures (treesit-query-capture (let ((captures (treesit-query-capture
(treesit-node-child-by-field-name node "pattern") node
,(treesit-query-compile 'rust '((identifier) @id ,(treesit-query-compile 'rust '((identifier) @id
(shorthand_field_identifier) @id))))) (shorthand_field_identifier) @id)))))
(pcase-dolist (`(_name . ,id) captures) (pcase-dolist (`(_name . ,id) captures)
@ -342,7 +347,7 @@ delimiters < and >'s."
(setq-local treesit-font-lock-feature-list (setq-local treesit-font-lock-feature-list
'(( comment definition) '(( comment definition)
( keyword string) ( keyword string)
( attribute builtin constant escape-sequence ( assignment attribute builtin constant escape-sequence
number type) number type)
( bracket delimiter error function operator property variable))) ( bracket delimiter error function operator property variable)))