From: "Augustin Chéneau" <btuin@mailo.com>
To: 65470@debbugs.gnu.org
Subject: bug#65470: 29.1.50; js-ts-mode: regex pattern can cause incorrect parenthesis matching
Date: Thu, 24 Aug 2023 21:31:33 +0200 [thread overview]
Message-ID: <2fbfdbf3-6062-49c3-bc48-eb5ab4817ab2@mailo.com> (raw)
In-Reply-To: <83fs49q8ui.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
I have created a patch heavily inspired from ruby-ts-mode.
It fixes the trivial examples and it works as expected in a more complex
file.
I'm not sure if the commit message is formatted properly.
[-- Attachment #2: 0001-Apply-syntax-properties-to-regex-delimiters-in-js-ts.patch --]
[-- Type: text/x-patch, Size: 1955 bytes --]
From d7bb7a77a57026f385c4137a25199eb2a2c15768 Mon Sep 17 00:00:00 2001
From: Augustin Chéneau <btuin@mailo.com>
Date: Thu, 24 Aug 2023 21:00:47 +0200
Subject: [PATCH] Apply syntax properties to regex delimiters in js-ts-mode
Add a property to regex slashes to avoid incorrect parenthesis
pairing by using `syntax-propertize-function` (Bug#65470)
* lisp/progmodes/js.el: add a new function to apply syntax properties
---
lisp/progmodes/js.el | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 9d2990e7bc9..efdddfeadf4 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3711,6 +3711,23 @@ js--treesit-valid-imenu-entry
("lexical_declaration" (treesit-node-top-level node))
(_ t)))
+(defvar js-ts--regex-query
+ (when (treesit-available-p)
+ (treesit-query-compile 'javascript
+ '(((regex "/" @regex_slash))))))
+
+(defun js-ts-mode--syntax-propertize (beg end)
+ "Apply syntax properties to special characters between BEG and END.
+
+Apply syntax properties to regex delimiters (slashes)."
+ (let ((captures (treesit-query-capture 'javascript js-ts--regex-query beg end)))
+ (pcase-dolist (`(,name . ,node) captures)
+ (pcase-exhaustive name
+ ('regex_slash
+ (put-text-property (treesit-node-start node) (1+ (treesit-node-start node))
+ 'syntax-table
+ (string-to-syntax "\"/")))))))
+
;;; Main Function
;;;###autoload
@@ -3850,6 +3867,9 @@ js-ts-mode
( assignment constant escape-sequence jsx number
pattern string-interpolation)
( bracket delimiter function operator property)))
+ ;; Syntax table
+ (setq-local syntax-propertize-function
+ #'js-ts-mode--syntax-propertize)
;; Imenu
(setq-local treesit-simple-imenu-settings
`(("Function" "\\`function_declaration\\'" nil nil)
--
2.42.0
next prev parent reply other threads:[~2023-08-24 19:31 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 [this message]
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
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=2fbfdbf3-6062-49c3-bc48-eb5ab4817ab2@mailo.com \
--to=btuin@mailo.com \
--cc=65470@debbugs.gnu.org \
/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).