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

rust-ts-mode: Highlight variable declarations

Browse source 
(rust-ts-mode--font-lock-settings): Change scoped_type_identifier
highlight to match similar cases.  Highlight variable declarations
inside all kinds of destructuring patterns, not just function
definitions.
* lisp/progmodes/rust-ts-mode.el (rust-ts-mode--fontify-pattern):
Rename from 'rust-ts-mode--fontify-parameter'.  Check the id node's
parent to avoid touching type identifiers.
This commit is contained in:
Dmitry Gutov 2023-02-05 18:49:24 +02:00
parent d12727057d
commit e38ff00463
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -162,7 +162,11 @@
(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-parameter) (parameter) @rust-ts-mode--fontify-pattern
(let_declaration) @rust-ts-mode--fontify-pattern
(for_expression) @rust-ts-mode--fontify-pattern
(let_condition) @rust-ts-mode--fontify-pattern
(match_arm) @rust-ts-mode--fontify-pattern)
:language 'rust :language 'rust
:feature 'function :feature 'function
@ -227,7 +231,7 @@
(scoped_identifier (scoped_identifier
name: (identifier) @font-lock-type-face)]) name: (identifier) @font-lock-type-face)])
(:match "^[A-Z]" @font-lock-type-face)) (:match "^[A-Z]" @font-lock-type-face))
(scoped_type_identifier path: (identifier) @font-lock-constant-face) (scoped_type_identifier path: (identifier) @font-lock-type-face)
(type_identifier) @font-lock-type-face (type_identifier) @font-lock-type-face
(use_as_clause alias: (identifier) @font-lock-type-face) (use_as_clause alias: (identifier) @font-lock-type-face)
(use_list (identifier) @font-lock-type-face)) (use_list (identifier) @font-lock-type-face))
@ -255,17 +259,21 @@
'((ERROR) @font-lock-warning-face)) '((ERROR) @font-lock-warning-face))
"Tree-sitter font-lock settings for `rust-ts-mode'.") "Tree-sitter font-lock settings for `rust-ts-mode'.")
(defalias 'rust-ts-mode--fontify-parameter (defalias 'rust-ts-mode--fontify-pattern
(and (and
(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") (treesit-node-child-by-field-name node "pattern")
,(treesit-query-compile 'rust '((identifier) @id))))) ,(treesit-query-compile 'rust '((identifier) @id
(shorthand_field_identifier) @id)))))
(pcase-dolist (`(_name . ,id) captures) (pcase-dolist (`(_name . ,id) captures)
(treesit-fontify-with-override (unless (string-match-p "\\`scoped_\\(?:type_\\)?identifier\\'"
(treesit-node-start id) (treesit-node-end id) (treesit-node-type
'font-lock-variable-name-face override start end)))))) (treesit-node-parent id)))
(treesit-fontify-with-override
(treesit-node-start id) (treesit-node-end id)
'font-lock-variable-name-face override start end)))))))
(defun rust-ts-mode--defun-name (node) (defun rust-ts-mode--defun-name (node)
"Return the defun name of NODE. "Return the defun name of NODE.