GNU bug report logs - #64019
29.0.91; Fix some tree-sitter :match regexps

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 64019 in the body.
You can then email your comments to 64019 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Basil L. Contovounesios" <contovob <at> tcd.ie>
To: bug-gnu-emacs <at> gnu.org
Subject: 29.0.91; Fix some tree-sitter :match regexps
Date: Mon, 12 Jun 2023 15:25:38 +0100

[Message part 1 (text/plain, inline)]

Tags: patch

With help from modified versions of the xr and relint packages,
I noticed some suspicious regexps in the new tree-sitter modes:

- Using bol/eol anchors where matching is performed against the whole
  node text
- Shy groups probably mistyped/copied as :? instead of ?:
- Identifiers defined as comprising [A-Z_\\d], where I assume \d was
  meant to match digits, but instead matches '\' or 'd'
- Unnecessary numbered grouping

These all occur in new Emacs 29 features, so the patch is intended for
emacs-29.

WDYT?

Thanks,

-- 
Basil

[0001-Fix-some-tree-sitter-match-regexps.patch (text/x-diff, attachment)]

[Message part 3 (text/plain, inline)]

In GNU Emacs 29.0.91 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo
 version 1.16.0, Xaw3d scroll bars) of 2023-06-12 built on blc
Repository revision: bdb0bc2b4e44a7d40369e10e3de825d58fe46825
Repository branch: wt/emacs-29
Windowing system distributor 'The X.Org Foundation', version 11.0.12101004
System Description: Ubuntu 22.04.2 LTS

Configured using:
 'configure CC=gcc-12 'CFLAGS=-Og -ggdb3' --prefix=/home/bic/.local
 --with-program-suffix=-29 --with-file-notification=yes --with-x
 --with-x-toolkit=lucid'

Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG
JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NOTIFY
INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF
TOOLKIT_SCROLL_BARS TREE_SITTER WEBP X11 XAW3D XDBE XIM XINPUT2 XPM
LUCID ZLIB

Important settings:
  value of $LC_MONETARY: en_IE.UTF-8
  value of $LC_NUMERIC: en_IE.UTF-8
  value of $LC_TIME: en_IE.UTF-8
  value of $LANG: en_GB.UTF-8
  value of $XMODIFIERS: @im=ibus
  locale-coding-system: utf-8-unix

Major mode: Lisp Interaction

Minor modes in effect:
  tooltip-mode: t
  global-eldoc-mode: t
  eldoc-mode: t
  show-paren-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  tool-bar-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  line-number-mode: t
  indent-tabs-mode: t
  transient-mark-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t

Load-path shadows:
None found.

Features:
(shadow sort mail-extr emacsbug message mailcap yank-media puny dired
dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068
epg-config gnus-util text-property-search time-date subr-x mm-decode
mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader
cl-loaddefs cl-lib sendmail rfc2047 rfc2045 ietf-drums mm-util
mail-prsvr mail-utils rmc iso-transl tooltip cconv eldoc paren electric
uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel
term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image
regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode
prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu
timer select scroll-bar mouse jit-lock font-lock syntax font-core
term/tty-colors frame minibuffer nadvice seq simple cl-generic
indonesian philippine cham georgian utf-8-lang misc-lang vietnamese
tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek
romanian slovak czech european ethiopic indian cyrillic chinese
composite emoji-zwj charscript charprop case-table epa-hook
jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs
theme-loaddefs faces cus-face macroexp files window text-properties
overlay sha1 md5 base64 format env code-pages mule custom widget keymap
hashtable-print-readable backquote threads dbusbind inotify lcms2
dynamic-setting system-font-setting font-render-setting cairo x-toolkit
xinput2 x multi-tty make-network-process emacs)

Memory information:
((conses 16 36709 7363)
 (symbols 48 5149 0)
 (strings 32 13887 1551)
 (string-bytes 1 379631)
 (vectors 16 9301)
 (vector-slots 8 148632 9511)
 (floats 8 23 25)
 (intervals 56 248 0)
 (buffers 984 10))

Message #8 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Mattias Engdegård <mattias.engdegard <at> gmail.com>
To: Basil Contovounesios <contovob <at> tcd.ie>
Cc: 64019 <at> debbugs.gnu.org
Subject: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Mon, 12 Jun 2023 16:48:08 +0200

> --- a/lisp/progmodes/c-ts-mode.el
> +++ b/lisp/progmodes/c-ts-mode.el
> @@ -1319,7 +1319,7 @@ c-ts-mode--c-or-c++-regexp
>                "\\|" id "::"
>                "\\|" id ws-maybe "=\\)"
>                "\\|" "\\(?:inline" ws "\\)?namespace"
> -              "\\(:?" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{"
> +              "\\(?:" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{"

If this one is wrong, then so is the regexp in cc-mode.el from this one was copied, right?

Message #11 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Basil Contovounesios <contovob <at> tcd.ie>
To: Mattias Engdegård <mattias.engdegard <at> gmail.com>
Cc: 64019 <at> debbugs.gnu.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Mon, 12 Jun 2023 16:10:31 +0100

Mattias Engdegård [2023-06-12 16:48 +0200] wrote:

>> --- a/lisp/progmodes/c-ts-mode.el
>> +++ b/lisp/progmodes/c-ts-mode.el
>> @@ -1319,7 +1319,7 @@ c-ts-mode--c-or-c++-regexp
>>                "\\|" id "::"
>>                "\\|" id ws-maybe "=\\)"
>>                "\\|" "\\(?:inline" ws "\\)?namespace"
>> -              "\\(:?" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{"
>> +              "\\(?:" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{"
>
> If this one is wrong, then so is the regexp in cc-mode.el from this one was copied, right?

Right, but I was going to suggest fixing that on master rather than
emacs-29, since it's been with us longer.

-- 
Basil

Message #14 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Basil Contovounesios <contovob <at> tcd.ie>
Cc: mattias.engdegard <at> gmail.com, 64019 <at> debbugs.gnu.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Mon, 12 Jun 2023 18:37:56 +0300

> Cc: 64019 <at> debbugs.gnu.org
> Date: Mon, 12 Jun 2023 16:10:31 +0100
> From:  Basil Contovounesios via "Bug reports for GNU Emacs,
>  the Swiss army knife of text editors" <bug-gnu-emacs <at> gnu.org>
> 
> Mattias Engdegård [2023-06-12 16:48 +0200] wrote:
> 
> >> --- a/lisp/progmodes/c-ts-mode.el
> >> +++ b/lisp/progmodes/c-ts-mode.el
> >> @@ -1319,7 +1319,7 @@ c-ts-mode--c-or-c++-regexp
> >>                "\\|" id "::"
> >>                "\\|" id ws-maybe "=\\)"
> >>                "\\|" "\\(?:inline" ws "\\)?namespace"
> >> -              "\\(:?" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{"
> >> +              "\\(?:" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{"
> >
> > If this one is wrong, then so is the regexp in cc-mode.el from this one was copied, right?
> 
> Right, but I was going to suggest fixing that on master rather than
> emacs-29, since it's been with us longer.

I'd rather we fixed all non-trivial stuff like this on master.  We do
want the pretest end at some point this year, don't we?

Message #17 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Mattias Engdegård <mattias.engdegard <at> gmail.com>
To: Basil Contovounesios <contovob <at> tcd.ie>
Cc: 64019 <at> debbugs.gnu.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Mon, 12 Jun 2023 18:07:12 +0200

12 juni 2023 kl. 17.10 skrev Basil Contovounesios <contovob <at> tcd.ie>:

> Right, but I was going to suggest fixing that on master rather than
> emacs-29, since it's been with us longer.

Yes, that will be fine.

Good catches otherwise. I particularly like the bug in several of the modes that will colour ABCd as a constant, but not ABCe or ABC2, despite the obvious intention that only the last should have that face.

Message #20 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Basil Contovounesios <contovob <at> tcd.ie>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: mattias.engdegard <at> gmail.com, 64019 <at> debbugs.gnu.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Mon, 12 Jun 2023 21:22:09 +0100

Eli Zaretskii [2023-06-12 11:37 -0400] wrote:

>> Cc: 64019 <at> debbugs.gnu.org
>> Date: Mon, 12 Jun 2023 16:10:31 +0100
>> From:  Basil Contovounesios via "Bug reports for GNU Emacs,
>>  the Swiss army knife of text editors" <bug-gnu-emacs <at> gnu.org>
>> 
>> Mattias Engdegård [2023-06-12 16:48 +0200] wrote:
>> 
>> >> --- a/lisp/progmodes/c-ts-mode.el
>> >> +++ b/lisp/progmodes/c-ts-mode.el
>> >> @@ -1319,7 +1319,7 @@ c-ts-mode--c-or-c++-regexp
>> >>                "\\|" id "::"
>> >>                "\\|" id ws-maybe "=\\)"
>> >>                "\\|" "\\(?:inline" ws "\\)?namespace"
>> >> -              "\\(:?" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{"
>> >> +              "\\(?:" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{"
>> >
>> > If this one is wrong, then so is the regexp in cc-mode.el from this one was copied, right?
>> 
>> Right, but I was going to suggest fixing that on master rather than
>> emacs-29, since it's been with us longer.
>
> I'd rather we fixed all non-trivial stuff like this on master.  We do
> want the pretest end at some point this year, don't we?

Yes please!  Are you referring to the whole patch, or is the rest of it
trivial enough for emacs-29?

Thanks,

-- 
Basil

Message #23 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dmitry <at> gutov.dev>
To: "Basil L. Contovounesios" <contovob <at> tcd.ie>, 64019 <at> debbugs.gnu.org
Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
 Daniel Colascione <dancol <at> dancol.org>, Theodor Thornhill <theo <at> thornhill.no>
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Tue, 13 Jun 2023 00:33:08 +0300

On 12/06/2023 17:25, Basil L. Contovounesios via Bug reports for GNU 
Emacs, the Swiss army knife of text editors wrote:
> -      (:match "^DEFUN$" @fn))
> +      (:match "\\`DEFUN\\'" @fn))

FWIW, most of these changes are superfluous, practically speaking, 
because node text for these node types (like 'identifier', in this 
example) cannot include newlines.

So we mostly gain some theoretical increase in strictness, at the 
expense of a few extra chars in the code.

With possible exception of c-ts-mode--c-or-c++-regexp, which I simply 
don't understand to be able to tell one way or another.

So I think we could wait until 29.1's release, for example, and then 
apply this on master.

Message #26 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dmitry <at> gutov.dev>
To: Mattias Engdegård <mattias.engdegard <at> gmail.com>,
 Basil Contovounesios <contovob <at> tcd.ie>
Cc: 64019 <at> debbugs.gnu.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Tue, 13 Jun 2023 00:39:45 +0300

On 12/06/2023 19:07, Mattias Engdegård wrote:
> I particularly like the bug in several of the modes that will colour ABCd as a constant, but not ABCe or ABC2, despite the obvious intention that only the last should have that face.

Could you point to some relevant part of the patch?

Message #29 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Basil Contovounesios <contovob <at> tcd.ie>
Cc: mattias.engdegard <at> gmail.com, 64019 <at> debbugs.gnu.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Tue, 13 Jun 2023 05:36:24 +0300

> From: Basil Contovounesios <contovob <at> tcd.ie>
> Cc: mattias.engdegard <at> gmail.com,  64019 <at> debbugs.gnu.org
> Date: Mon, 12 Jun 2023 21:22:09 +0100
> 
> Eli Zaretskii [2023-06-12 11:37 -0400] wrote:
> 
> >> > If this one is wrong, then so is the regexp in cc-mode.el from this one was copied, right?
> >> 
> >> Right, but I was going to suggest fixing that on master rather than
> >> emacs-29, since it's been with us longer.
> >
> > I'd rather we fixed all non-trivial stuff like this on master.  We do
> > want the pretest end at some point this year, don't we?
> 
> Yes please!  Are you referring to the whole patch, or is the rest of it
> trivial enough for emacs-29?

The changes from "^..$" to "\\`..\\'" are fine.  The rest should be
discussed on a cased by case basis.  And those which should also be
fixed in CC Mode should be fixed on master in both.

Message #32 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Dmitry Gutov <dmitry <at> gutov.dev>
Cc: dev <at> rjt.dev, casouri <at> gmail.com, theo <at> thornhill.no, contovob <at> tcd.ie,
 64019 <at> debbugs.gnu.org, dancol <at> dancol.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Tue, 13 Jun 2023 05:37:56 +0300

> Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
>  Daniel Colascione <dancol <at> dancol.org>, Theodor Thornhill <theo <at> thornhill.no>
> Date: Tue, 13 Jun 2023 00:33:08 +0300
> From: Dmitry Gutov <dmitry <at> gutov.dev>
> 
> So I think we could wait until 29.1's release, for example, and then 
> apply this on master.

Fine by me, thanks.

Message #35 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Mattias Engdegård <mattias.engdegard <at> gmail.com>
To: Dmitry Gutov <dmitry <at> gutov.dev>
Cc: Basil Contovounesios <contovob <at> tcd.ie>, 64019 <at> debbugs.gnu.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Tue, 13 Jun 2023 09:47:08 +0200

12 juni 2023 kl. 23.39 skrev Dmitry Gutov <dmitry <at> gutov.dev>:

> On 12/06/2023 19:07, Mattias Engdegård wrote:
>> I particularly like the bug in several of the modes that will colour ABCd as a constant, but not ABCe or ABC2, despite the obvious intention that only the last should have that face.
> 
> Could you point to some relevant part of the patch?

The ones replacing \d with 0-9:

-      (:match "^[A-Z_][A-Z_\\d]*$" @font-lock-constant-face))
+      (:match "\\`[A-Z_][0-9A-Z_]*\\'" @font-lock-constant-face))

Message #38 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Basil Contovounesios <contovob <at> tcd.ie>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: mattias.engdegard <at> gmail.com, 64019 <at> debbugs.gnu.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Tue, 13 Jun 2023 14:51:30 +0100

Eli Zaretskii [2023-06-12 22:36 -0400] wrote:

> The changes from "^..$" to "\\`..\\'" are fine.

Thanks, installed on emacs-29:

Fix bol/bos anchors in tree-sitter :match regexps
8dc08333eea 2023-06-13 14:35:14 +0100
https://git.sv.gnu.org/cgit/emacs.git/commit/?id=8dc08333eea

-- 
Basil

Message #41 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Basil Contovounesios <contovob <at> tcd.ie>
To: Dmitry Gutov <dmitry <at> gutov.dev>
Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
 64019 <at> debbugs.gnu.org, Theodor Thornhill <theo <at> thornhill.no>,
 Daniel Colascione <dancol <at> dancol.org>
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Tue, 13 Jun 2023 15:08:01 +0100

[Message part 1 (text/plain, inline)]

Dmitry Gutov [2023-06-13 00:33 +0300] wrote:

> On 12/06/2023 17:25, Basil L. Contovounesios via Bug reports for GNU Emacs, the
> Swiss army knife of text editors wrote:
>> -      (:match "^DEFUN$" @fn))
>> +      (:match "\\`DEFUN\\'" @fn))
>
> FWIW, most of these changes are superfluous, practically speaking

I'm less concerned about the trivial bol/bos conversions in the patch
and more about the corrections to incorrect regexps, such as:
- the more benign \(:?...\) -> \(?:...\)
- and the less benign [\d] -> [0-9].

> because node text for these node types (like 'identifier', in this
> example) cannot include newlines.
>
> So we mostly gain some theoretical increase in strictness, 

We also gain the fact that the next one looking at these regexps doesn't
need to figure out whether newlines can appear in this context: the
regexp immediately says it's intended to match the whole given text
rather than a line of text.

> at the expense of a few extra chars in the code.

That's not really an expense, but a symptom of our regexp syntax, so it
can't be helped.

> So I think we could wait until 29.1's release, for example, and then apply this
> on master.

Those parts that will end up applied on master don't need to wait for
29.1, do they?  If so, why?

Here's the updated patch against emacs-29:

[0001-Fix-some-tree-sitter-match-regexps.patch (text/x-diff, attachment)]

[Message part 3 (text/plain, inline)]

WDYT?

Thanks,

-- 
Basil

Message #44 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dmitry <at> gutov.dev>
To: Mattias Engdegård <mattias.engdegard <at> gmail.com>
Cc: Basil Contovounesios <contovob <at> tcd.ie>, 64019 <at> debbugs.gnu.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Tue, 13 Jun 2023 20:06:23 +0300

On 13/06/2023 10:47, Mattias Engdegård wrote:
> 12 juni 2023 kl. 23.39 skrev Dmitry Gutov<dmitry <at> gutov.dev>:
> 
>> On 12/06/2023 19:07, Mattias Engdegård wrote:
>>> I particularly like the bug in several of the modes that will colour ABCd as a constant, but not ABCe or ABC2, despite the obvious intention that only the last should have that face.
>> Could you point to some relevant part of the patch?
> The ones replacing \d with 0-9:
> 
> -      (:match "^[A-Z_][A-Z_\\d]*$" @font-lock-constant-face))
> +      (:match "\\`[A-Z_][0-9A-Z_]*\\'" @font-lock-constant-face))
> 

Makes sense, thanks.

Message #47 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dmitry <at> gutov.dev>
To: Basil Contovounesios <contovob <at> tcd.ie>
Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
 64019 <at> debbugs.gnu.org, Theodor Thornhill <theo <at> thornhill.no>,
 Daniel Colascione <dancol <at> dancol.org>
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Tue, 13 Jun 2023 20:06:42 +0300

On 13/06/2023 17:08, Basil Contovounesios wrote:
> Dmitry Gutov [2023-06-13 00:33 +0300] wrote:
> 
>> On 12/06/2023 17:25, Basil L. Contovounesios via Bug reports for GNU Emacs, the
>> Swiss army knife of text editors wrote:
>>> -      (:match "^DEFUN$" @fn))
>>> +      (:match "\\`DEFUN\\'" @fn))
>> FWIW, most of these changes are superfluous, practically speaking
> I'm less concerned about the trivial bol/bos conversions in the patch
> and more about the corrections to incorrect regexps, such as:
> - the more benign \(:?...\) -> \(?:...\)
> - and the less benign [\d] -> [0-9].
> 

Yep, these look valuable. Thanks.

Message #50 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Basil Contovounesios <contovob <at> tcd.ie>
To: Dmitry Gutov <dmitry <at> gutov.dev>
Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
 Mattias Engdegård <mattias.engdegard <at> gmail.com>,
 Theodor Thornhill <theo <at> thornhill.no>, 64019 <at> debbugs.gnu.org,
 Daniel Colascione <dancol <at> dancol.org>
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Thu, 15 Jun 2023 18:17:29 +0100

[Message part 1 (text/plain, inline)]

Basil Contovounesios [2023-06-13 15:08 +0100] wrote:

> I'm less concerned about the trivial bol/bos conversions in the patch
> and more about the corrections to incorrect regexps, such as:
> - the more benign \(:?...\) -> \(?:...\)
> - and the less benign [\d] -> [0-9].
[...]
> Here's the updated patch against emacs-29:

Mattias also spotted the following in
https://github.com/mattiase/relint/pull/14:

[ruby.diff (text/x-diff, inline)]

diff --git a/lisp/progmodes/ruby-ts-mode.el b/lisp/progmodes/ruby-ts-mode.el
index 91d65a2777b..4b951f7606f 100644
--- a/lisp/progmodes/ruby-ts-mode.el
+++ b/lisp/progmodes/ruby-ts-mode.el
@@ -1021,7 +1021,7 @@ ruby-ts--s-p-query
                               (:match "\\`\\$[#\"'`:?]" @global_var))
                              ;; ?' ?" ?` are character literals.
                              ((character) @char
-                              (:match "\\`?[#\"'`:?]" @char))
+                              (:match "\\`\\?[#\"'`:?]" @char))
                              ;; Symbols like :+, :<=> or :foo=.
                              ((simple_symbol) @symbol
                               (:match "\\s." @symbol))

[Message part 3 (text/plain, inline)]

Is that TRT?

Thanks,

-- 
Basil

Message #53 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dmitry <at> gutov.dev>
To: Basil Contovounesios <contovob <at> tcd.ie>
Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
 Mattias Engdegård <mattias.engdegard <at> gmail.com>,
 Theodor Thornhill <theo <at> thornhill.no>, 64019 <at> debbugs.gnu.org,
 Daniel Colascione <dancol <at> dancol.org>
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sat, 17 Jun 2023 05:00:24 +0300

On 15/06/2023 20:17, Basil Contovounesios wrote:
> Mattias also spotted the following in
> https://github.com/mattiase/relint/pull/14:
> 
> -                              (:match "\\`?[#\"'`:?]" @char))
> +                              (:match "\\`\\?[#\"'`:?]" @char))

I don't mind, but it seems like both versions do the same thing:

(string-match-p "\\`?!" "?!") => 0

(string-match-p "\\`?!" "!") => nil

Same results with "\\`\\?!".

Message #56 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Schwab <schwab <at> linux-m68k.org>
To: Dmitry Gutov <dmitry <at> gutov.dev>
Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
 Mattias Engdegård <mattias.engdegard <at> gmail.com>,
 Theodor Thornhill <theo <at> thornhill.no>, Basil Contovounesios <contovob <at> tcd.ie>,
 64019 <at> debbugs.gnu.org, Daniel Colascione <dancol <at> dancol.org>
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sat, 17 Jun 2023 08:48:20 +0200

On Jun 17 2023, Dmitry Gutov wrote:

> On 15/06/2023 20:17, Basil Contovounesios wrote:
>> Mattias also spotted the following in
>> https://github.com/mattiase/relint/pull/14:
>> -                              (:match "\\`?[#\"'`:?]" @char))
>> +                              (:match "\\`\\?[#\"'`:?]" @char))
>
> I don't mind, but it seems like both versions do the same thing:
>
> (string-match-p "\\`?!" "?!") => 0
>
> (string-match-p "\\`?!" "!") => nil

This depends on `?' being treated as an ordinary character if occuring
in a context where the special meaning does not make sense, which is
poor practice.

-- 
Andreas Schwab, schwab <at> linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."

Message #59 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Mattias Engdegård <mattias.engdegard <at> gmail.com>
To: Andreas Schwab <schwab <at> linux-m68k.org>
Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
 Theodor Thornhill <theo <at> thornhill.no>, Basil Contovounesios <contovob <at> tcd.ie>,
 Dmitry Gutov <dmitry <at> gutov.dev>, 64019 <at> debbugs.gnu.org,
 Daniel Colascione <dancol <at> dancol.org>
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sat, 17 Jun 2023 10:39:16 +0200

17 juni 2023 kl. 08.48 skrev Andreas Schwab <schwab <at> linux-m68k.org>:

>>> -                              (:match "\\`?[#\"'`:?]" @char))
>>> +                              (:match "\\`\\?[#\"'`:?]" @char))
>> 
>> I don't mind, but it seems like both versions do the same thing:

Interesting! Now as Andreas says,

> This depends on `?' being treated as an ordinary character if occuring
> in a context where the special meaning does not make sense, which is
> poor practice.

which is quite right and that `?` should indeed be escaped for style reasons if nothing else.
However there appears to be a hitherto unknown parsing bug in the Emacs regexp parser here.
(And in xr, which has the ambition to be mostly bug-compatible with Emacs.)

I'll open a new bug about it.

Message #62 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Mattias Engdegård <mattias.engdegard <at> gmail.com>
To: Andreas Schwab <schwab <at> linux-m68k.org>
Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
 Theodor Thornhill <theo <at> thornhill.no>, Basil Contovounesios <contovob <at> tcd.ie>,
 Dmitry Gutov <dmitry <at> gutov.dev>, 64019 <at> debbugs.gnu.org,
 Daniel Colascione <dancol <at> dancol.org>
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sat, 17 Jun 2023 14:21:51 +0200

> I'll open a new bug about it.

Now bug#64128.

Message #65 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dmitry <at> gutov.dev>
To: Mattias Engdegård <mattias.engdegard <at> gmail.com>,
 Andreas Schwab <schwab <at> linux-m68k.org>
Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
 Theodor Thornhill <theo <at> thornhill.no>, Basil Contovounesios <contovob <at> tcd.ie>,
 64019 <at> debbugs.gnu.org, Daniel Colascione <dancol <at> dancol.org>
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sat, 17 Jun 2023 18:44:20 +0300

On 17/06/2023 11:39, Mattias Engdegård wrote:
> Interesting! Now as Andreas says,
> 
>> This depends on `?' being treated as an ordinary character if occuring
>> in a context where the special meaning does not make sense, which is
>> poor practice.
> which is quite right and that `?` should indeed be escaped for style reasons if nothing else.

Sure.

Message #70 received at 64019-done <at> debbugs.gnu.org (full text, mbox):

From: Basil Contovounesios <contovob <at> tcd.ie>
To: Dmitry Gutov <dmitry <at> gutov.dev>
Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
 64019-done <at> debbugs.gnu.org,
 Mattias Engdegård <mattias.engdegard <at> gmail.com>,
 Theodor Thornhill <theo <at> thornhill.no>, Andreas Schwab <schwab <at> linux-m68k.org>,
 Daniel Colascione <dancol <at> dancol.org>
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sat, 17 Jun 2023 17:13:19 +0100

close 64019 29.1
quit

Pushed and closing.

Fix some tree-sitter :match regexps
95091b77f0b 2023-06-17 16:41:35 +0100
https://git.sv.gnu.org/cgit/emacs.git/commit/?id=95091b77f0b

Thanks,

-- 
Basil

Message #73 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Basil Contovounesios <contovob <at> tcd.ie>
Cc: dev <at> rjt.dev, casouri <at> gmail.com, mattias.engdegard <at> gmail.com,
 theo <at> thornhill.no, dmitry <at> gutov.dev, 64019 <at> debbugs.gnu.org,
 schwab <at> linux-m68k.org, dancol <at> dancol.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sat, 17 Jun 2023 19:34:01 +0300

> Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
>  64019-done <at> debbugs.gnu.org,
>  Mattias Engdegård <mattias.engdegard <at> gmail.com>,
>  Theodor Thornhill <theo <at> thornhill.no>, Andreas Schwab <schwab <at> linux-m68k.org>,
>  Daniel Colascione <dancol <at> dancol.org>
> Date: Sat, 17 Jun 2023 17:13:19 +0100
> From:  Basil Contovounesios via "Bug reports for GNU Emacs,
>  the Swiss army knife of text editors" <bug-gnu-emacs <at> gnu.org>
> 
> close 64019 29.1
> quit
> 
> Pushed and closing.
> 
> Fix some tree-sitter :match regexps
> 95091b77f0b 2023-06-17 16:41:35 +0100
> https://git.sv.gnu.org/cgit/emacs.git/commit/?id=95091b77f0b

I didn't agree for this to go to emacs-29, though.  So why did it end
up there?

Message #76 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Basil Contovounesios <contovob <at> tcd.ie>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: dev <at> rjt.dev, casouri <at> gmail.com, mattias.engdegard <at> gmail.com,
 theo <at> thornhill.no, dmitry <at> gutov.dev, 64019 <at> debbugs.gnu.org,
 schwab <at> linux-m68k.org, dancol <at> dancol.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sat, 17 Jun 2023 17:56:43 +0100

Eli Zaretskii [2023-06-17 19:34 +0300] wrote:

>> Cc: Randy Taylor <dev <at> rjt.dev>, Yuan Fu <casouri <at> gmail.com>,
>>  64019-done <at> debbugs.gnu.org,
>>  Mattias Engdegård <mattias.engdegard <at> gmail.com>,
>>  Theodor Thornhill <theo <at> thornhill.no>, Andreas Schwab <schwab <at> linux-m68k.org>,
>>  Daniel Colascione <dancol <at> dancol.org>
>> Date: Sat, 17 Jun 2023 17:13:19 +0100
>> From:  Basil Contovounesios via "Bug reports for GNU Emacs,
>>  the Swiss army knife of text editors" <bug-gnu-emacs <at> gnu.org>
>> 
>> close 64019 29.1
>> quit
>> 
>> Pushed and closing.
>> 
>> Fix some tree-sitter :match regexps
>> 95091b77f0b 2023-06-17 16:41:35 +0100
>> https://git.sv.gnu.org/cgit/emacs.git/commit/?id=95091b77f0b
>
> I didn't agree for this to go to emacs-29, though.  So why did it end
> up there?

Sorry, I misunderstood.  Shall I revert?

-- 
Basil

Message #79 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Basil Contovounesios <contovob <at> tcd.ie>
Cc: dev <at> rjt.dev, casouri <at> gmail.com, mattias.engdegard <at> gmail.com,
 theo <at> thornhill.no, dmitry <at> gutov.dev, 64019 <at> debbugs.gnu.org,
 schwab <at> linux-m68k.org, dancol <at> dancol.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sat, 17 Jun 2023 20:35:41 +0300

> From: Basil Contovounesios <contovob <at> tcd.ie>
> Cc: dev <at> rjt.dev,  casouri <at> gmail.com,  mattias.engdegard <at> gmail.com,
>   theo <at> thornhill.no,  dmitry <at> gutov.dev,  64019 <at> debbugs.gnu.org,
>   schwab <at> linux-m68k.org,  dancol <at> dancol.org
> Date: Sat, 17 Jun 2023 17:56:43 +0100
> 
> Eli Zaretskii [2023-06-17 19:34 +0300] wrote:
> 
> >> close 64019 29.1
> >> quit
> >> 
> >> Pushed and closing.
> >> 
> >> Fix some tree-sitter :match regexps
> >> 95091b77f0b 2023-06-17 16:41:35 +0100
> >> https://git.sv.gnu.org/cgit/emacs.git/commit/?id=95091b77f0b
> >
> > I didn't agree for this to go to emacs-29, though.  So why did it end
> > up there?
> 
> Sorry, I misunderstood.  Shall I revert?

Yes, please install it on master.  We can backport later, after Emacs
29.1 is released.

Message #82 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Basil Contovounesios <contovob <at> tcd.ie>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: dev <at> rjt.dev, casouri <at> gmail.com, mattias.engdegard <at> gmail.com,
 theo <at> thornhill.no, dmitry <at> gutov.dev, 64019 <at> debbugs.gnu.org,
 schwab <at> linux-m68k.org, dancol <at> dancol.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sat, 17 Jun 2023 20:54:24 +0100

Eli Zaretskii [2023-06-17 20:35 +0300] wrote:

>> From: Basil Contovounesios <contovob <at> tcd.ie>
>> Cc: dev <at> rjt.dev,  casouri <at> gmail.com,  mattias.engdegard <at> gmail.com,
>>   theo <at> thornhill.no,  dmitry <at> gutov.dev,  64019 <at> debbugs.gnu.org,
>>   schwab <at> linux-m68k.org,  dancol <at> dancol.org
>> Date: Sat, 17 Jun 2023 17:56:43 +0100
>> 
>> Eli Zaretskii [2023-06-17 19:34 +0300] wrote:
>> 
>> > I didn't agree for this to go to emacs-29, though.  So why did it end
>> > up there?
>> 
>> Sorry, I misunderstood.  Shall I revert?

Reverted:

Revert "Fix some tree-sitter :match regexps"
02f0be03017 2023-06-17 20:39:16 +0100
https://git.sv.gnu.org/cgit/emacs.git/commit/?id=02f0be03017

> Yes, please install it on master.

Done:

Fix some tree-sitter :match regexps
cd8d3f3379e 2023-06-17 20:47:50 +0100
https://git.sv.gnu.org/cgit/emacs.git/commit/?id=cd8d3f3379e

> We can backport later, after Emacs 29.1 is released.

Okay, thanks,

-- 
Basil

Message #89 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: "Basil L. Contovounesios" <contovob <at> tcd.ie>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: dev <at> rjt.dev, casouri <at> gmail.com, mattias.engdegard <at> gmail.com,
 theo <at> thornhill.no, dmitry <at> gutov.dev, 64019 <at> debbugs.gnu.org,
 schwab <at> linux-m68k.org, dancol <at> dancol.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sun, 30 Jul 2023 14:46:44 +0200

notfixed 64019 29.1
fixed 64019 30.1
quit

Eli Zaretskii [2023-06-17 13:35 -0400] wrote:

>> From: Basil Contovounesios <contovob <at> tcd.ie>
>> Cc: dev <at> rjt.dev,  casouri <at> gmail.com,  mattias.engdegard <at> gmail.com,
>>   theo <at> thornhill.no,  dmitry <at> gutov.dev,  64019 <at> debbugs.gnu.org,
>>   schwab <at> linux-m68k.org,  dancol <at> dancol.org
>> Date: Sat, 17 Jun 2023 17:56:43 +0100
>> 
>> Eli Zaretskii [2023-06-17 19:34 +0300] wrote:
>> 
>> >> Fix some tree-sitter :match regexps
>> >> 95091b77f0b 2023-06-17 16:41:35 +0100
>> >> https://git.sv.gnu.org/cgit/emacs.git/commit/?id=95091b77f0b
>> >
>> > I didn't agree for this to go to emacs-29, though.  So why did it end
>> > up there?
>> 
>> Sorry, I misunderstood.  Shall I revert?
>
> Yes, please install it on master.  We can backport later, after Emacs
> 29.1 is released.

Following the wonderful news that 29.1 is released, can this be
considered for backporting?

Thanks!

-- 
Basil

Message #96 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: "Basil L. Contovounesios" <contovob <at> tcd.ie>
Cc: dev <at> rjt.dev, casouri <at> gmail.com, mattias.engdegard <at> gmail.com,
 theo <at> thornhill.no, dmitry <at> gutov.dev, 64019 <at> debbugs.gnu.org,
 schwab <at> linux-m68k.org, dancol <at> dancol.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sun, 30 Jul 2023 15:59:41 +0300

> From: "Basil L. Contovounesios" <contovob <at> tcd.ie>
> Cc: dev <at> rjt.dev,  casouri <at> gmail.com,  mattias.engdegard <at> gmail.com,
>   theo <at> thornhill.no,  dmitry <at> gutov.dev,  64019 <at> debbugs.gnu.org,
>   schwab <at> linux-m68k.org,  dancol <at> dancol.org
> Date: Sun, 30 Jul 2023 14:46:44 +0200
> 
> > Yes, please install it on master.  We can backport later, after Emacs
> > 29.1 is released.
> 
> Following the wonderful news that 29.1 is released, can this be
> considered for backporting?

Yes, thanks.

Message #99 received at 64019 <at> debbugs.gnu.org (full text, mbox):

From: "Basil L. Contovounesios" <contovob <at> tcd.ie>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: dev <at> rjt.dev, casouri <at> gmail.com, mattias.engdegard <at> gmail.com,
 theo <at> thornhill.no, dmitry <at> gutov.dev, 64019 <at> debbugs.gnu.org,
 schwab <at> linux-m68k.org, dancol <at> dancol.org
Subject: Re: bug#64019: 29.0.91; Fix some tree-sitter :match regexps
Date: Sun, 30 Jul 2023 18:04:24 +0200

fixed 64019 29.2
quit

Eli Zaretskii [2023-07-30 15:59 +0300] wrote:

>> From: "Basil L. Contovounesios" <contovob <at> tcd.ie>
>> Cc: dev <at> rjt.dev,  casouri <at> gmail.com,  mattias.engdegard <at> gmail.com,
>>   theo <at> thornhill.no,  dmitry <at> gutov.dev,  64019 <at> debbugs.gnu.org,
>>   schwab <at> linux-m68k.org,  dancol <at> dancol.org
>> Date: Sun, 30 Jul 2023 14:46:44 +0200
>> 
>> Following the wonderful news that 29.1 is released, can this be
>> considered for backporting?
>
> Yes, thanks.

Thanks, done:

Backport: Fix some tree-sitter :match regexps
ba60070b81c 2023-07-30 17:39:34 +0200
https://git.sv.gnu.org/cgit/emacs.git/commit/?id=ba60070b81c

-- 
Basil

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.