bug#60546: Acknowledgement (29.0.60; typescript-ts-mode and tsx-ts-mode does not highlight variable-declarations in catch-clauses)

["Jostein Kjønigsen" <jostein@secure.kjonigsen.net>]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

On 04.01.2023 10:32, Jostein Kjønigsen wrote:
> And yeah. This one should improve things even further.
>
> Can you tell I'm used to working with pull-requests where I can just 
> keep on pushing and refining the fixes? :P
>
> -- 
> Jostein

Someone give me a vacuum cleaner. I've found more to clean :D

--
Jostein

[-- Attachment #2: 0002-Fix-highlighting-of-variable-declarations-in-typescr.patch --]
[-- Type: text/x-patch, Size: 2308 bytes --]

From 7de3d51cd47a9145ca075af28cac5660cc263598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jostein=20Kj=C3=B8nigsen?= <jostein@kjonigsen.net>
Date: Wed, 4 Jan 2023 09:13:23 +0100
Subject: [PATCH 2/2] Fix highlighting of variable-declarations in
 typescript-ts-mode

lisp/progmodes/typescript-ts-mode.el:
- 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 | 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 e0583f4b05c..75481d5c226 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -194,7 +194,10 @@ typescript-ts-mode--font-lock-settings
       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 @@ typescript-ts-mode--font-lock-settings
       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 @@ typescript-ts-mode--font-lock-settings
 
      (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)
-- 
2.37.2