all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* bug#60167: 30.0.50; [PATCH]: Fix wrong capture in typescript-ts-mode
@ 2022-12-17 19:15 Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
  2022-12-17 23:37 ` Yuan Fu
  2022-12-18  8:08 ` Yuan Fu
  0 siblings, 2 replies; 4+ messages in thread
From: Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors @ 2022-12-17 19:15 UTC (permalink / raw)
  To: 60167; +Cc: Jostein Kjønigsen, casouri

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


Hi there!

We've had a small regression after
fbf0d3b796ac1b891be35b642878a1fd412ee5ea, and this patch fixes that.
Yuan, want to apply after Josteins agrees on this fix?  There's an
example of the currently failing code in the commit message.  There's
also a small whitespace fix inside - I hope that's ok.

Thanks guys :-)

Theo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-wrong-capture-in-typescript-ts-mode.patch --]
[-- Type: text/x-diff, Size: 1841 bytes --]

From 931e96cd042aefe2807329de84751aa1a9e45bbb Mon Sep 17 00:00:00 2001
From: Theodor Thornhill <theo@thornhill.no>
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:

    <Menu.Item>
        {({ active }) => (
          link
            ? <Link to={link}> {text}</Link>
            : <a href="#" onClick={onClick}>{text}</a>
        )}
    </Menu.Item>

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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* bug#60167: 30.0.50; [PATCH]: Fix wrong capture in  typescript-ts-mode
  2022-12-17 19:15 bug#60167: 30.0.50; [PATCH]: Fix wrong capture in typescript-ts-mode Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
@ 2022-12-17 23:37 ` Yuan Fu
  2022-12-18  6:25   ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
  2022-12-18  8:08 ` Yuan Fu
  1 sibling, 1 reply; 4+ messages in thread
From: Yuan Fu @ 2022-12-17 23:37 UTC (permalink / raw)
  To: Theodor Thornhill; +Cc: 60167, jostein


Theodor Thornhill <theo@thornhill.no> writes:

> Hi there!
>
> We've had a small regression after
> fbf0d3b796ac1b891be35b642878a1fd412ee5ea, and this patch fixes that.
> Yuan, want to apply after Josteins agrees on this fix?  There's an
> example of the currently failing code in the commit message.  There's
> also a small whitespace fix inside - I hope that's ok.
>
> Thanks guys :-)
>
> Theo

Cool, I’ll wait for Jostein’s opinion :-)

Yuan





^ permalink raw reply	[flat|nested] 4+ messages in thread

* bug#60167: 30.0.50; [PATCH]: Fix wrong capture in  typescript-ts-mode
  2022-12-17 23:37 ` Yuan Fu
@ 2022-12-18  6:25   ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
  0 siblings, 0 replies; 4+ messages in thread
From: Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors @ 2022-12-18  6:25 UTC (permalink / raw)
  To: Yuan Fu; +Cc: 60167, jostein



On 18 December 2022 00:37:30 CET, Yuan Fu <casouri@gmail.com> wrote:
>
>Theodor Thornhill <theo@thornhill.no> writes:
>
>> Hi there!
>>
>> We've had a small regression after
>> fbf0d3b796ac1b891be35b642878a1fd412ee5ea, and this patch fixes that.
>> Yuan, want to apply after Josteins agrees on this fix?  There's an
>> example of the currently failing code in the commit message.  There's
>> also a small whitespace fix inside - I hope that's ok.
>>
>> Thanks guys :-)
>>
>> Theo
>
>Cool, I’ll wait for Jostein’s opinion :-)
>
>Yuan

He agreed :)
Theo





^ permalink raw reply	[flat|nested] 4+ messages in thread

* bug#60167: 30.0.50; [PATCH]: Fix wrong capture in  typescript-ts-mode
  2022-12-17 19:15 bug#60167: 30.0.50; [PATCH]: Fix wrong capture in typescript-ts-mode Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
  2022-12-17 23:37 ` Yuan Fu
@ 2022-12-18  8:08 ` Yuan Fu
  1 sibling, 0 replies; 4+ messages in thread
From: Yuan Fu @ 2022-12-18  8:08 UTC (permalink / raw)
  To: Theodor Thornhill; +Cc: 60167-done, jostein


Theodor Thornhill <theo@thornhill.no> writes:

> On 18 December 2022 00:37:30 CET, Yuan Fu <casouri@gmail.com> wrote:
>>
>>Theodor Thornhill <theo@thornhill.no> writes:
>>
>>> Hi there!
>>>
>>> We've had a small regression after
>>> fbf0d3b796ac1b891be35b642878a1fd412ee5ea, and this patch fixes that.
>>> Yuan, want to apply after Josteins agrees on this fix?  There's an
>>> example of the currently failing code in the commit message.  There's
>>> also a small whitespace fix inside - I hope that's ok.
>>>
>>> Thanks guys :-)
>>>
>>> Theo
>>
>>Cool, I’ll wait for Jostein’s opinion :-)
>>
>>Yuan
>
> He agreed :)
> Theo

Yeah I think I saw his message but it didn’t appear on debbugs for some
reason. Anyway, I applied the patch, thanks!

Yuan





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-12-18  8:08 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-17 19:15 bug#60167: 30.0.50; [PATCH]: Fix wrong capture in typescript-ts-mode Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-17 23:37 ` Yuan Fu
2022-12-18  6:25   ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-18  8:08 ` Yuan Fu

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.