]> git.eshelyaron.com Git - emacs.git/commit
Backport: Fix some tree-sitter :match regexps
authorBasil L. Contovounesios <contovob@tcd.ie>
Tue, 13 Jun 2023 12:53:31 +0000 (13:53 +0100)
committerBasil L. Contovounesios <contovob@tcd.ie>
Sun, 30 Jul 2023 15:39:34 +0000 (17:39 +0200)
commitba60070b81c4b507b856269031a17b99e9f5e77c
tree54e95a6dc696b437fdc0bda74a0101677f9e231c
parent092a2ecb083d9f3e301c5b9bf23e0f2f666fec27
Backport: Fix some tree-sitter :match regexps

This was originally installed on 2023-06-17 in the emacs-29 release
branch and later reverted.  This backport follows the Emacs 29.1
release (bug#64019).

The shy groups were caught by modified versions of the GNU ELPA
packages xr and relint:
- https://github.com/mattiase/xr/pull/6
- https://github.com/mattiase/relint/pull/14

* lisp/progmodes/ruby-ts-mode.el (ruby-ts--s-p-query): Quote special
character in regexp.
* lisp/progmodes/java-ts-mode.el (java-ts-mode--font-lock-settings):
* lisp/progmodes/js.el (js--plain-method-re):
(js--treesit-font-lock-settings):
* lisp/progmodes/rust-ts-mode.el (rust-ts-mode--font-lock-settings):
* lisp/progmodes/typescript-ts-mode.el
(typescript-ts-mode--font-lock-settings): Replace character
alternative [\\d], which matches '\' or 'd', with the most likely
intention [0-9].  Fix shy groups mistyped as optional colons.
Remove unneeded numbered :match group in rust-ts-mode.

(cherry picked from commit cd8d3f3379ec7179fac4bb8e9c40658be15a64f6)
lisp/progmodes/java-ts-mode.el
lisp/progmodes/js.el
lisp/progmodes/ruby-ts-mode.el
lisp/progmodes/rust-ts-mode.el
lisp/progmodes/typescript-ts-mode.el