From 931e96cd042aefe2807329de84751aa1a9e45bbb Mon Sep 17 00:00:00 2001 From: Theodor Thornhill Date: Sat, 17 Dec 2022 20:07:59 +0100 Subject: [PATCH] Fix wrong capture in typescript-ts-mode An example of the issue could be: {({ active }) => ( link ? {text} : {text} )} Here 'link' as well as a lot of the other constructs inside of the parenthesized expression will be font-locked with 'font-lock-variable-name-face'. We only want to capture the identifier. * lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode--font-lock-settings): Make the variable capture only capture the identifier, and not the whole expression. --- lisp/progmodes/typescript-ts-mode.el | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el index e7bd65c5e2..5eb810dd1d 100644 --- a/lisp/progmodes/typescript-ts-mode.el +++ b/lisp/progmodes/typescript-ts-mode.el @@ -231,7 +231,7 @@ typescript-ts-mode--font-lock-settings (arguments (identifier) @font-lock-variable-name-face) (parenthesized_expression (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 @@ -316,10 +316,7 @@ typescript-ts-mode--font-lock-settings :language language :feature 'escape-sequence :override t - '((escape_sequence) @font-lock-escape-face) - - - )) + '((escape_sequence) @font-lock-escape-face))) ;;;###autoload (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode)) -- 2.34.1