From: "Jostein Kjønigsen" <jostein@secure.kjonigsen.net>
To: Dmitry Gutov <dmitry@gutov.dev>
Cc: "Yuan Fu" <casouri@gmail.com>,
65470@debbugs.gnu.org, "Theodor Thornhill" <theo@thornhill.no>,
btuin@mailo.com, "Eli Zaretskii" <eliz@gnu.org>,
"Jostein Kjønigsen" <jostein@kjonigsen.net>
Subject: bug#65470: 29.1.50; js-ts-mode: regex pattern can cause incorrect parenthesis matching
Date: Fri, 15 Sep 2023 14:11:12 +0200 [thread overview]
Message-ID: <D7DD8EA9-6B8C-461E-9A59-331C76E364F4@secure.kjonigsen.net> (raw)
In-Reply-To: <dc2caf72-0b30-6c39-7c36-58857301f85d@gutov.dev>
> On 13 Sep 2023, at 01:14, Dmitry Gutov <dmitry@gutov.dev> wrote:
>
> On 12/09/2023 09:29, Jostein Kjønigsen wrote:
>> Good feedback. I’ve tested and included those as well. Attached is a new patch.
>
> Thanks! Installed. It would've been better with a commit message too (next time).
>
> Speaking of the TSX difficulties, though, which Yuan hinted at recently: I think the current fix (tsx-ts-mode--font-lock-compatibility-bb1f97b) is not working. To be clear, that's unrelated to the current patch.
>
> Basically, the query for ((member_expression) @capture) succeeds, but then the more complex one fails with
>
> Structure error at: 22
> (jsx_opening_element [(member_expression (identifier)) (identifier)] @typescript-ts-jsx-tag-face) (jsx_closing_element [(member_expression (identifier)) (identifier)] @typescript-ts-jsx-tag-face) (jsx_self_closing_element [(member_expression (identifier)) (identifier)] @typescript-ts-jsx-tag-face)
>
> This patch seems to fix that and bring JSX syntax highlighting back:
>
> diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
> index 57382c9cb31..7108ff49b28 100644
> --- a/lisp/progmodes/typescript-ts-mode.el
> +++ b/lisp/progmodes/typescript-ts-mode.el
> @@ -163,7 +163,7 @@ tsx-ts-mode--font-lock-compatibility-bb1f97b
> ;; but then raises an error if the wrong node type is used. So it is
> ;; important to check with the new node type (member_expression)
> (condition-case nil
> - (progn (treesit-query-capture language '((member_expression) @capture))
> + (progn (treesit-query-capture language '(jsx_opening_element (member_expression) @capture))
> '((jsx_opening_element
> [(member_expression (identifier)) (identifier)]
> @typescript-ts-jsx-tag-face)
>
I really don’t know this part of the code very well. If you’ve identified an issue/bug for a specific TSX use-case, and found a fix for it, I have no objections to it being applied.
—
Jostein
next prev parent reply other threads:[~2023-09-15 12:11 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-23 9:05 bug#65470: 29.1.50; js-ts-mode: regex pattern can cause incorrect parenthesis matching Augustin Chéneau
2023-08-23 13:23 ` Dmitry Gutov
2023-08-24 5:59 ` Eli Zaretskii
2023-08-24 19:31 ` Augustin Chéneau
2023-08-24 19:47 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-08-25 0:18 ` Dmitry Gutov
2023-08-25 5:30 ` Eli Zaretskii
2023-08-25 7:17 ` Augustin Chéneau
2023-08-26 1:52 ` Dmitry Gutov
2023-08-25 6:59 ` Jostein Kjønigsen
2023-08-25 18:27 ` Yuan Fu
2023-08-26 9:22 ` Jostein Kjønigsen
2023-08-26 15:29 ` Fu Yuan
2023-08-26 21:13 ` Jostein Kjønigsen
2023-08-26 21:45 ` Dmitry Gutov
2023-08-31 9:41 ` Eli Zaretskii
2023-08-31 11:15 ` Dmitry Gutov
2023-08-31 12:53 ` Eli Zaretskii
2023-09-01 1:42 ` Dmitry Gutov
2023-09-05 19:31 ` Jostein Kjønigsen
2023-09-07 8:59 ` Eli Zaretskii
2023-09-07 9:02 ` Stefan Kangas
2023-09-07 12:09 ` Dmitry Gutov
2023-09-11 19:37 ` Jostein Kjønigsen
2023-09-11 22:23 ` Dmitry Gutov
2023-09-12 6:29 ` Jostein Kjønigsen
2023-09-12 23:14 ` Dmitry Gutov
2023-09-15 12:11 ` Jostein Kjønigsen [this message]
2023-09-15 13:35 ` Dmitry Gutov
2023-09-16 5:54 ` Eli Zaretskii
2023-09-16 11:20 ` Eli Zaretskii
2023-09-16 11:40 ` Eli Zaretskii
2023-09-16 20:07 ` Dmitry Gutov
2023-09-16 13:59 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-16 20:05 ` Dmitry Gutov
2023-09-17 5:22 ` Eli Zaretskii
2023-09-01 15:45 ` Augustin Chéneau
2023-09-01 15:58 ` Eli Zaretskii
2023-09-01 19:21 ` Dmitry Gutov
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=D7DD8EA9-6B8C-461E-9A59-331C76E364F4@secure.kjonigsen.net \
--to=jostein@secure.kjonigsen.net \
--cc=65470@debbugs.gnu.org \
--cc=btuin@mailo.com \
--cc=casouri@gmail.com \
--cc=dmitry@gutov.dev \
--cc=eliz@gnu.org \
--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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).