From fbf0d3b796ac1b891be35b642878a1fd412ee5ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jostein=20Kj=C3=B8nigsen?= Date: Wed, 7 Dec 2022 09:27:42 +0100 Subject: [PATCH] Improve fontifications in Typescript mode * lisp/progmodes/typescript-ts-mode.el: Improve fontification of variables. (Bug#59831) --- lisp/progmodes/typescript-ts-mode.el | 42 +++++++++++++++++----------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el index e4d188971a0..b8a921e9c24 100644 --- a/lisp/progmodes/typescript-ts-mode.el +++ b/lisp/progmodes/typescript-ts-mode.el @@ -225,7 +225,31 @@ Argument LANGUAGE is either `typescript' or `tsx'." (binary_expression left: (identifier) @font-lock-variable-name-face) (binary_expression right: (identifier) @font-lock-variable-name-face) - (arguments (identifier) @font-lock-variable-name-face)) + (arguments (identifier) @font-lock-variable-name-face) + + (parenthesized_expression (identifier) @font-lock-variable-name-face) + (parenthesized_expression (_ (identifier)) @font-lock-variable-name-face)) + + :language language + :override t + :feature 'property + `((property_signature + name: (property_identifier) @font-lock-property-face) + (public_field_definition + name: (property_identifier) @font-lock-property-face) + (member_expression + object: (identifier) @font-lock-variable-name-face) + (member_expression + property: (_) @font-lock-property-face) + + (pair key: (property_identifier) @font-lock-variable-name-face) + + (pair value: (identifier) @font-lock-variable-name-face) + + ((shorthand_property_identifier) @font-lock-property-face) + + ((shorthand_property_identifier_pattern) + @font-lock-property-face)) :language language :override t @@ -291,22 +315,8 @@ Argument LANGUAGE is either `typescript' or `tsx'." :override t '((escape_sequence) @font-lock-escape-face) - :language language - :override t - :feature 'property - `((property_signature - name: (property_identifier) @font-lock-property-face) - (public_field_definition - name: (property_identifier) @font-lock-property-face) - (pair key: (property_identifier) @font-lock-variable-name-face) - - (pair value: (identifier) @font-lock-variable-name-face) - - ((shorthand_property_identifier) @font-lock-property-face) - - ((shorthand_property_identifier_pattern) - @font-lock-property-face)))) + )) ;;;###autoload (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode)) -- 2.39.2