From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jostein =?UTF-8?Q?Kj=C3=B8nigsen?= Newsgroups: gmane.emacs.bugs Subject: bug#59831: 29.0.60; typescript-ts-mode: Variables, properties & fields are often not fontified Date: Mon, 5 Dec 2022 10:05:30 +0100 Message-ID: <2151efc1-b6f6-4e0d-7416-cccae9277a34@secure.kjonigsen.net> References: <676d4e95-dfe3-5ced-60a3-b2387512ee63@secure.kjonigsen.net> <87v8mqxmfo.fsf@thornhill.no> Reply-To: jostein@kjonigsen.net Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------kNaHaaLH7RbVISibYpXji0KE" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15239"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Cc: jostein@kjonigsen.net, casuri@gmail.com To: Theodor Thornhill , 59831@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 05 10:06:44 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p27Qw-0003l2-8a for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 05 Dec 2022 10:06:43 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p27Qg-000621-Lx; Mon, 05 Dec 2022 04:06:26 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p27QJ-0005vo-1K for bug-gnu-emacs@gnu.org; Mon, 05 Dec 2022 04:06:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p27QI-0004H9-Iw for bug-gnu-emacs@gnu.org; Mon, 05 Dec 2022 04:06:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p27QI-0001uI-1o for bug-gnu-emacs@gnu.org; Mon, 05 Dec 2022 04:06:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jostein =?UTF-8?Q?Kj=C3=B8nigsen?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 05 Dec 2022 09:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59831 X-GNU-PR-Package: emacs Original-Received: via spool by 59831-submit@debbugs.gnu.org id=B59831.16702311407322 (code B ref 59831); Mon, 05 Dec 2022 09:06:02 +0000 Original-Received: (at 59831) by debbugs.gnu.org; 5 Dec 2022 09:05:40 +0000 Original-Received: from localhost ([127.0.0.1]:34780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p27Pv-0001u2-Ov for submit@debbugs.gnu.org; Mon, 05 Dec 2022 04:05:40 -0500 Original-Received: from out2-smtp.messagingengine.com ([66.111.4.26]:60373) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p27Pu-0001tv-8H for 59831@debbugs.gnu.org; Mon, 05 Dec 2022 04:05:39 -0500 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D81015C008B; Mon, 5 Dec 2022 04:05:32 -0500 (EST) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 05 Dec 2022 04:05:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= secure.kjonigsen.net; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:sender:subject:subject:to:to; s=fm3; t= 1670231132; x=1670317532; bh=VH/nDz3VAWcrL2QoSVwJOwlR/y3Iz0iYXHo lXmRS72M=; b=CJ0GGh/OHfCY8tI5EmHiLtqaSA6GI6EfPgWyWiAZ6l8XncngJwU poqnHFRf2VTedRVjmQGQ31ZBweYnXZhWFjRsPG7WugosWRLgA/3Fv+yI71NVXpks zmv83hDk++8mKBBURF25yn9HEQ6CerKaUiNyU2oRfkHQTBvKRnZ6wYWnHZDqldtX HAh48Y2we1rM0HyB29qd6f58gyBocd9Wzxue8duZ+9cAEn8KUgC5a/naNmBTeg+P YlwdiYXfKj/K6IE+ZF9L9Ifrp7VhHchtqftAoDOJR/GDGDUzWXllcj0tc77K6NlR 1IuEiuTil89EcX8RRvUCLswpcNQBkxMBlnQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1670231132; x=1670317532; bh=VH/nDz3VAWcrL 2QoSVwJOwlR/y3Iz0iYXHolXmRS72M=; b=sinxQMBFhENHGx6e24U2DUs9w/OnY JB0k18dI5hvavYpuucniaCJX1gfvuddhP1caSv6prU3hzDtKTKwpdgd1eiY+tdwa Yv2SXQlygAWiK9O/OTNVWuKzw8cfKG9h+w2SaFnsWGJeWo1ObkQS+ugu4UTV6UrB EDV/U+p//Tjk+g+XdLjmg9AoT74FuZrt/h77o/esYvaTtKsq5fs69EbEAFgDFXeb OZM5ag/0fpJ+S1EqwEzWKsQIlFsOgyJxByVhH0S8KVK+3fzs8O8nwROJBHcQgSQ0 NIo4clxTHQNewp/Nn4yN7bUYu565KfhFA06aoiGBbQbWYbWoJLXxKl4FQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudegucetufdoteggodetrfdotffvucfrrh hofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgenuceurghi lhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurh eptgfkffggfghruffvvehfhfgjsehmtderredtfeejnecuhfhrohhmpeflohhsthgvihhn ucfmjhppnhhighhsvghnuceojhhoshhtvghinhesshgvtghurhgvrdhkjhhonhhighhsvg hnrdhnvghtqeenucggtffrrghtthgvrhhnpeevteevvedvffduheekudetledtffeuudet uedtveelffdvtdetuddtleelveduleenucffohhmrghinhepkhhjnhhighhsvghnrdhnoh enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehjohhs thgvihhnsehsvggtuhhrvgdrkhhjohhnihhgshgvnhdrnhgvth X-ME-Proxy: Feedback-ID: ib2f84088:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 5 Dec 2022 04:05:31 -0500 (EST) Content-Language: nb-NO In-Reply-To: <87v8mqxmfo.fsf@thornhill.no> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:250001 Archived-At: This is a multi-part message in MIME format. --------------kNaHaaLH7RbVISibYpXji0KE Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Attached is another patch with some further improvements. These too OK with you, Theodor? -- Jostein jostein@kjonigsen.net 🍵 jostein@gmail.com https://jostein.kjønigsen.no On 05.12.2022 09:51, Theodor Thornhill wrote: > Jostein Kjønigsen writes: > >> When I create or use a class in a Typescript-file, I often have >> properties and field declarations. >> >> These are all fontified using default-face, instead of >> font-lock-property-face. >> >> Also when creating new objects using bracket syntac { key: value, key: >> value, etc: etc }, default-face is used. >> >> Attached is a patch which improves fontification of these aspects in >> both typescript-ts-mode and typescript-tsx-mode. >> >> It also contains code to further improve fontification of >> retuen-statements, which IMO is a little bit lacking. >> > LGTM :) Yuan, feel free to apply when you have some free time! > >> From 3bcbd89cc43c6ad7885f11aa4c7c92ebd600a164 Mon Sep 17 00:00:00 2001 >> From: =?UTF-8?q?Jostein=20Kj=C3=B8nigsen?= >> Date: Mon, 5 Dec 2022 09:31:58 +0100 >> Subject: [PATCH] lisp/progmodes/typescript-ts-mode: improve fontification >> >> - syntax-highlight property and field definitions in class declaration. >> - syntax-highlight property-keys in object initializaters. >> - syntax-highlight variable-names in function/method return-statements. >> --- >> lisp/progmodes/typescript-ts-mode.el | 13 +++++++++++-- >> 1 file changed, 11 insertions(+), 2 deletions(-) >> >> diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el >> index 48ac1169fe8..48d3c084b6e 100644 >> --- a/lisp/progmodes/typescript-ts-mode.el >> +++ b/lisp/progmodes/typescript-ts-mode.el >> @@ -213,7 +213,9 @@ 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)))])) >> + (_ (_ (_ (identifier) @font-lock-variable-name-face)))]) >> + >> + (return_statement (identifier) @font-lock-variable-name-face)) >> >> :language language >> :override t >> @@ -282,7 +284,14 @@ typescript-ts-mode--font-lock-settings >> :language language >> :override t >> :feature 'property >> - `((pair value: (identifier) @font-lock-variable-name-face) >> + `((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) >> > Thanks! > > Theo --------------kNaHaaLH7RbVISibYpXji0KE Content-Type: text/x-patch; charset=UTF-8; name="0002-lisp-progmodes-typescript-ts-mode-Improve-fontificat.patch" Content-Disposition: attachment; filename*0="0002-lisp-progmodes-typescript-ts-mode-Improve-fontificat.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA0NDFiMjM0MGYwYThkOWJmMjdiMGRiY2I5ODUwNTFjODQ2NzJmNDFmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Sm9zdGVpbj0yMEtqPUMzPUI4bmln c2VuPz0gPGpvc3RlaW5Aa2pvbmlnc2VuLm5ldD4KRGF0ZTogTW9uLCA1IERlYyAyMDIyIDEw OjAwOjE1ICswMTAwClN1YmplY3Q6IFtQQVRDSCAyLzJdIGxpc3AvcHJvZ21vZGVzL3R5cGVz Y3JpcHQtdHMtbW9kZTogSW1wcm92ZSBmb250aWZpY2F0aW9ucwogb2YgdmFyaWFibGVzIGlu IHVzZS4KCi0tLQogbGlzcC9wcm9nbW9kZXMvdHlwZXNjcmlwdC10cy1tb2RlLmVsIHwgNyAr KysrKystCiAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0p CgpkaWZmIC0tZ2l0IGEvbGlzcC9wcm9nbW9kZXMvdHlwZXNjcmlwdC10cy1tb2RlLmVsIGIv bGlzcC9wcm9nbW9kZXMvdHlwZXNjcmlwdC10cy1tb2RlLmVsCmluZGV4IDQ4ZDNjMDg0YjZl Li4zZGE2OTA1NjdlMiAxMDA2NDQKLS0tIGEvbGlzcC9wcm9nbW9kZXMvdHlwZXNjcmlwdC10 cy1tb2RlLmVsCisrKyBiL2xpc3AvcHJvZ21vZGVzL3R5cGVzY3JpcHQtdHMtbW9kZS5lbApA QCAtMjE1LDcgKzIxNSwxMiBAQCB0eXBlc2NyaXB0LXRzLW1vZGUtLWZvbnQtbG9jay1zZXR0 aW5ncwogICAgICAgIChfIChfIChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXZhcmlhYmxlLW5h bWUtZmFjZSkpCiAgICAgICAgKF8gKF8gKF8gKGlkZW50aWZpZXIpIEBmb250LWxvY2stdmFy aWFibGUtbmFtZS1mYWNlKSkpXSkKIAotICAgICAocmV0dXJuX3N0YXRlbWVudCAoaWRlbnRp ZmllcikgQGZvbnQtbG9jay12YXJpYWJsZS1uYW1lLWZhY2UpKQorICAgICAocmV0dXJuX3N0 YXRlbWVudCAoaWRlbnRpZmllcikgQGZvbnQtbG9jay12YXJpYWJsZS1uYW1lLWZhY2UpCisK KyAgICAgKGJpbmFyeV9leHByZXNzaW9uIGxlZnQ6IChpZGVudGlmaWVyKSBAZm9udC1sb2Nr LXZhcmlhYmxlLW5hbWUtZmFjZSkKKyAgICAgKGJpbmFyeV9leHByZXNzaW9uIHJpZ2h0OiAo aWRlbnRpZmllcikgQGZvbnQtbG9jay12YXJpYWJsZS1uYW1lLWZhY2UpCisKKyAgICAgKGFy Z3VtZW50cyAoaWRlbnRpZmllcikgQGZvbnQtbG9jay12YXJpYWJsZS1uYW1lLWZhY2UpKQog CiAgICA6bGFuZ3VhZ2UgbGFuZ3VhZ2UKICAgIDpvdmVycmlkZSB0Ci0tIAoyLjM3LjIKCg== --------------kNaHaaLH7RbVISibYpXji0KE--