From 4a72f13bdfb7806b933b5198641938cbf3586611 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 8 Dec 2023 04:12:21 +0200 Subject: [PATCH] js-ts-mode: Highlight property shorthands in assignments * lisp/progmodes/js.el (js--treesit-lhs-identifier-query): Match property shorthands (which turn into variable reference). (js--treesit-fontify-assignment-lhs): Use the matches. --- lisp/progmodes/js.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 03f34647288..eb4adc627ee 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3664,7 +3664,8 @@ OVERRIDE is the override flag described in (defvar js--treesit-lhs-identifier-query (when (treesit-available-p) (treesit-query-compile 'javascript '((identifier) @id - (property_identifier) @id))) + (property_identifier) @id + (shorthand_property_identifier_pattern) @id))) "Query that captures identifier and query_identifier.") (defun js--treesit-fontify-assignment-lhs (node override start end &rest _) @@ -3676,7 +3677,8 @@ For OVERRIDE, START, END, see `treesit-font-lock-rules'." (treesit-node-start node) (treesit-node-end node) (pcase (treesit-node-type node) ("identifier" 'font-lock-variable-use-face) - ("property_identifier" 'font-lock-property-use-face)) + ("property_identifier" 'font-lock-property-use-face) + ("shorthand_property_identifier_pattern" 'font-lock-variable-use-face)) override start end))) (defun js--treesit-defun-name (node) -- 2.39.2