all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Jostein Kjønigsen" <jostein@secure.kjonigsen.net>
To: Yuan Fu <casouri@gmail.com>, Theodor Thornhill <theo@thornhill.no>
Cc: 59831@debbugs.gnu.org
Subject: bug#59831: 29.0.60; typescript-ts-mode: Variables, properties & fields are often not fontified
Date: Wed, 7 Dec 2022 10:24:56 +0100	[thread overview]
Message-ID: <848e54b0-4b74-2d85-064d-bf8dc792d1e8@secure.kjonigsen.net> (raw)
In-Reply-To: <A402A2D0-1BD0-4C97-9294-EC449A2EF394@gmail.com>


[-- Attachment #1.1: Type: text/plain, Size: 806 bytes --]

Hey everyone.

I'd like to add one more change to this particular bug, which makes 
fontification of variables more consistent when used in other 
expressions and statements.

Please see attached patch.

In short this patch changes the following:

  * fontifies property-access in general expressions
  * fontifies variables and property-access in if-expressions

--
Jostein

On 05.12.2022 21:13, Yuan Fu wrote:
>
>> On Dec 5, 2022, at 1:24 AM, Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors<bug-gnu-emacs@gnu.org>  wrote:
>>
>> Jostein Kjønigsen<jostein@secure.kjonigsen.net>  writes:
>>
>>> Attached is another patch with some further improvements.
>>>
>>> These too OK with you, Theodor?
>>>
>> Yep!
> I squashed the two commits and applied them, Thanks!
>
> Yuan

[-- Attachment #1.2: Type: text/html, Size: 1702 bytes --]

[-- Attachment #2: 0001-lisp-progmodes-typescript-ts-mode.el-Improve-fontifi.patch --]
[-- Type: text/x-patch, Size: 2602 bytes --]

From 0817a9a9ce00bf44e6368a3d74262f83e49ebbf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jostein=20Kj=C3=B8nigsen?= <jostein@kjonigsen.net>
Date: Wed, 7 Dec 2022 09:27:42 +0100
Subject: [PATCH] lisp/progmodes/typescript-ts-mode.el: Improve fontification
 of variables

---
 lisp/progmodes/typescript-ts-mode.el | 43 +++++++++++++++++-----------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index 3da690567e2..33f332d66d6 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -220,7 +220,32 @@ typescript-ts-mode--font-lock-settings
      (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))
+
+   :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
+      property: (_) @font-lock-property-face)
+     (member_expression
+      object: (this) @font-lock-keyword-face
+      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
@@ -286,22 +311,8 @@ typescript-ts-mode--font-lock-settings
    :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.37.2


  reply	other threads:[~2022-12-07  9:24 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-05  8:42 bug#59831: 29.0.60; typescript-ts-mode: Variables, properties & fields are often not fontified Jostein Kjønigsen
2022-12-05  8:51 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-05  9:05   ` Jostein Kjønigsen
2022-12-05  9:24     ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-05 20:13       ` Yuan Fu
2022-12-07  9:24         ` Jostein Kjønigsen [this message]
2022-12-07  9:33           ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-07  9:42             ` Jostein Kjønigsen
2022-12-12  7:53               ` Jostein Kjønigsen
2022-12-14 18:46                 ` Jostein Kjønigsen
2022-12-14 19:03                   ` Eli Zaretskii
2022-12-14 19:39                     ` Yuan Fu
2022-12-14 21:56                       ` Jostein Kjønigsen
2022-12-14 22:21                         ` Yuan Fu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=848e54b0-4b74-2d85-064d-bf8dc792d1e8@secure.kjonigsen.net \
    --to=jostein@secure.kjonigsen.net \
    --cc=59831@debbugs.gnu.org \
    --cc=casouri@gmail.com \
    --cc=jostein@kjonigsen.net \
    --cc=theo@thornhill.no \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.