emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 2cdd75a18f 07/10: Fix highlighting of variable-declarations in


From: Yuan Fu
Subject: emacs-29 2cdd75a18f 07/10: Fix highlighting of variable-declarations in typescript-ts-mode
Date: Sat, 7 Jan 2023 21:44:44 -0500 (EST)

branch: emacs-29
commit 2cdd75a18ff8815ca22a04228e3282e54097e242
Author: Jostein Kjønigsen <jostein@kjonigsen.net>
Commit: Yuan Fu <casouri@gmail.com>

    Fix highlighting of variable-declarations in typescript-ts-mode
    
    (bug#60546)
    
    - Highlight variable declarations in catch-clauses.
    - Remove highlighting of variables where not declarations (improve
      consistency with other *-ts-modes).
    
    * lisp/progmodes/typescript-ts-mode.el:
    (typescript-ts-mode--font-lock-settings): See above.
---
 lisp/progmodes/typescript-ts-mode.el | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/lisp/progmodes/typescript-ts-mode.el 
b/lisp/progmodes/typescript-ts-mode.el
index 5a9a7eea95..b26dca101d 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -194,7 +194,10 @@ Argument LANGUAGE is either `typescript' or `tsx'."
       name: (array_pattern
              (identifier)
              (identifier) @font-lock-function-name-face)
-      value: (array (number) (function))))
+      value: (array (number) (function)))
+
+     (catch_clause
+      parameter: (identifier) @font-lock-variable-name-face))
 
    :language language
    :override t
@@ -223,17 +226,7 @@ Argument LANGUAGE is either `typescript' or `tsx'."
       parameters:
       [(_ (identifier) @font-lock-variable-name-face)
        (_ (_ (identifier) @font-lock-variable-name-face))
-       (_ (_ (_ (identifier) @font-lock-variable-name-face)))])
-
-     (return_statement (identifier) @font-lock-variable-name-face)
-
-     (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)
-
-     (parenthesized_expression (identifier) @font-lock-variable-name-face)
-     (parenthesized_expression (_ (identifier) @font-lock-variable-name-face)))
+       (_ (_ (_ (identifier) @font-lock-variable-name-face)))]))
 
    :language language
    :override t
@@ -245,8 +238,6 @@ Argument LANGUAGE is either `typescript' or `tsx'."
 
      (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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]