GNU bug report logs - #67117
[PATCH] Tree-sitter: fix an issue when searching subtree backward

Previous Next

Package: emacs;

Reported by: Denis Zubarev <dvzubarev <at> yandex.ru>

Date: Sat, 11 Nov 2023 23:40:02 UTC

Severity: normal

Tags: patch

Done: Yuan Fu <casouri <at> gmail.com>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Sat, 11 Nov 2023 23:40:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Denis Zubarev <dvzubarev <at> yandex.ru>:
New bug report received and forwarded. Copy sent to bug-gnu-emacs <at> gnu.org. (Sat, 11 Nov 2023 23:40:02 GMT) Full text and rfc822 format available.

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

From: Denis Zubarev <dvzubarev <at> yandex.ru>
To: bug-gnu-emacs <at> gnu.org
Subject: [PATCH] Tree-sitter: fix an issue when searching subtree backward
Date: Sun, 12 Nov 2023 02:38:33 +0300
[Message part 1 (text/plain, inline)]
Tags: patch


Steps to reproduce the issue:
1. emacs -Q
2. M-x find-file /tmp/t.py
3. paste to the buffer
 
Temp(1, 2) 
 
4. M-x python-ts-mode
5. Call search-subtree with backward flag
   M-x eval-expression (treesit-search-subtree
               (treesit--thing-at (point) "call")
               (lambda (n) (equal (treesit-node-type n ) "integer"))
               t)
It should return the second int node (#<treesit-node integer in 9-10>), but it returns nil.

I fixed it in treesit_traverse_child_helper.
Do not call treesit_traverse_sibling_helper when the named node is
required and the last child is the named node.
Otherwise treesit_traverse_sibling_helper will move cursor to the
previous sibling and the last node will be skipped.
I've added test for this bug.




In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version
 3.24.33, cairo version 1.16.0) of 2023-11-12 built on NUC-here
Repository revision: 400a71b8f2c5a49dce4f542adfd2fdb59eb34243
Repository branch: search-subtree-bacward-fix
Windowing system distributor 'The X.Org Foundation', version 11.0.12101004
System Description: Ubuntu 22.04.3 LTS

Configured using:
 'configure --with-modules --with-native-compilation=aot
 --with-imagemagick --with-json --with-tree-sitter --with-xft'

[0001-Fix-an-issue-when-searching-subtree-backward.patch (text/patch, attachment)]

Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Wed, 15 Nov 2023 16:29:03 GMT) Full text and rfc822 format available.

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

From: Eli Zaretskii <eliz <at> gnu.org>
To: Denis Zubarev <dvzubarev <at> yandex.ru>, Yuan Fu <casouri <at> gmail.com>
Cc: 67117 <at> debbugs.gnu.org
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Wed, 15 Nov 2023 15:21:59 +0200
> From: Denis Zubarev <dvzubarev <at> yandex.ru>
> Date: Sun, 12 Nov 2023 02:38:33 +0300
> 
> Steps to reproduce the issue:
> 1. emacs -Q
> 2. M-x find-file /tmp/t.py
> 3. paste to the buffer
>  
> Temp(1, 2) 
>  
> 4. M-x python-ts-mode
> 5. Call search-subtree with backward flag
>    M-x eval-expression (treesit-search-subtree
>                (treesit--thing-at (point) "call")
>                (lambda (n) (equal (treesit-node-type n ) "integer"))
>                t)
> It should return the second int node (#<treesit-node integer in 9-10>), but it returns nil.

Yuan, any comments to the patch and the issue in general?

Denis, your changes are too large for us to accept them without a
copyright assignment.  Would you like to start your assignment
paperwork at this time, so that we could accept this contribution, and
all your future ones?

Thanks.




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Wed, 15 Nov 2023 17:02:02 GMT) Full text and rfc822 format available.

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

From: Eli Zaretskii <eliz <at> gnu.org>
To: dvzubarev <at> yandex.ru
Cc: 67117 <at> debbugs.gnu.org, casouri <at> gmail.com
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Wed, 15 Nov 2023 19:01:28 +0200
> Cc: 67117 <at> debbugs.gnu.org
> Date: Wed, 15 Nov 2023 15:21:59 +0200
> From: Eli Zaretskii <eliz <at> gnu.org>
> 
> Denis, your changes are too large for us to accept them without a
> copyright assignment.  Would you like to start your assignment
> paperwork at this time, so that we could accept this contribution, and
> all your future ones?

Oops, I see that you already started the paperwork.  So let's wait for
it to run to completion.




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Sat, 18 Nov 2023 18:49:02 GMT) Full text and rfc822 format available.

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

From: Yuan Fu <casouri <at> gmail.com>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 67117 <at> debbugs.gnu.org, Denis Zubarev <dvzubarev <at> yandex.ru>
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Sat, 18 Nov 2023 10:47:47 -0800

> On Nov 15, 2023, at 5:21 AM, Eli Zaretskii <eliz <at> gnu.org> wrote:
> 
>> From: Denis Zubarev <dvzubarev <at> yandex.ru>
>> Date: Sun, 12 Nov 2023 02:38:33 +0300
>> 
>> Steps to reproduce the issue:
>> 1. emacs -Q
>> 2. M-x find-file /tmp/t.py
>> 3. paste to the buffer
>> 
>> Temp(1, 2) 
>> 
>> 4. M-x python-ts-mode
>> 5. Call search-subtree with backward flag
>>   M-x eval-expression (treesit-search-subtree
>>               (treesit--thing-at (point) "call")
>>               (lambda (n) (equal (treesit-node-type n ) "integer"))
>>               t)
>> It should return the second int node (#<treesit-node integer in 9-10>), but it returns nil.
> 
> Yuan, any comments to the patch and the issue in general?

LGTM. Thanks Denis, and Eli :-)

Yuan



Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Sun, 19 Nov 2023 05:48:01 GMT) Full text and rfc822 format available.

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

From: Eli Zaretskii <eliz <at> gnu.org>
To: Yuan Fu <casouri <at> gmail.com>
Cc: 67117 <at> debbugs.gnu.org, dvzubarev <at> yandex.ru
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Sun, 19 Nov 2023 07:47:13 +0200
> From: Yuan Fu <casouri <at> gmail.com>
> Date: Sat, 18 Nov 2023 10:47:47 -0800
> Cc: Denis Zubarev <dvzubarev <at> yandex.ru>,
>  67117 <at> debbugs.gnu.org
> 
> 
> >> Steps to reproduce the issue:
> >> 1. emacs -Q
> >> 2. M-x find-file /tmp/t.py
> >> 3. paste to the buffer
> >> 
> >> Temp(1, 2) 
> >> 
> >> 4. M-x python-ts-mode
> >> 5. Call search-subtree with backward flag
> >>   M-x eval-expression (treesit-search-subtree
> >>               (treesit--thing-at (point) "call")
> >>               (lambda (n) (equal (treesit-node-type n ) "integer"))
> >>               t)
> >> It should return the second int node (#<treesit-node integer in 9-10>), but it returns nil.
> > 
> > Yuan, any comments to the patch and the issue in general?
> 
> LGTM. Thanks Denis, and Eli :-)

Should we install this on the emacs-29 branch or on master?




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Sun, 19 Nov 2023 06:15:01 GMT) Full text and rfc822 format available.

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

From: Yuan Fu <casouri <at> gmail.com>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 67117 <at> debbugs.gnu.org, dvzubarev <at> yandex.ru
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Sat, 18 Nov 2023 22:13:49 -0800

> On Nov 18, 2023, at 9:47 PM, Eli Zaretskii <eliz <at> gnu.org> wrote:
> 
>> From: Yuan Fu <casouri <at> gmail.com>
>> Date: Sat, 18 Nov 2023 10:47:47 -0800
>> Cc: Denis Zubarev <dvzubarev <at> yandex.ru>,
>> 67117 <at> debbugs.gnu.org
>> 
>> 
>>>> Steps to reproduce the issue:
>>>> 1. emacs -Q
>>>> 2. M-x find-file /tmp/t.py
>>>> 3. paste to the buffer
>>>> 
>>>> Temp(1, 2) 
>>>> 
>>>> 4. M-x python-ts-mode
>>>> 5. Call search-subtree with backward flag
>>>>  M-x eval-expression (treesit-search-subtree
>>>>              (treesit--thing-at (point) "call")
>>>>              (lambda (n) (equal (treesit-node-type n ) "integer"))
>>>>              t)
>>>> It should return the second int node (#<treesit-node integer in 9-10>), but it returns nil.
>>> 
>>> Yuan, any comments to the patch and the issue in general?
>> 
>> LGTM. Thanks Denis, and Eli :-)
> 
> Should we install this on the emacs-29 branch or on master?

Emacs-29, I’d say, since it’s a bug fix. Why do you ask?

Yuan





Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Sun, 19 Nov 2023 06:42:02 GMT) Full text and rfc822 format available.

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

From: Eli Zaretskii <eliz <at> gnu.org>
To: Yuan Fu <casouri <at> gmail.com>
Cc: 67117 <at> debbugs.gnu.org, dvzubarev <at> yandex.ru
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Sun, 19 Nov 2023 08:40:51 +0200
> From: Yuan Fu <casouri <at> gmail.com>
> Date: Sat, 18 Nov 2023 22:13:49 -0800
> Cc: dvzubarev <at> yandex.ru,
>  67117 <at> debbugs.gnu.org
> 
> 
> 
> > On Nov 18, 2023, at 9:47 PM, Eli Zaretskii <eliz <at> gnu.org> wrote:
> > 
> >> From: Yuan Fu <casouri <at> gmail.com>
> >> Date: Sat, 18 Nov 2023 10:47:47 -0800
> >> Cc: Denis Zubarev <dvzubarev <at> yandex.ru>,
> >> 67117 <at> debbugs.gnu.org
> >> 
> >> 
> >>>> Steps to reproduce the issue:
> >>>> 1. emacs -Q
> >>>> 2. M-x find-file /tmp/t.py
> >>>> 3. paste to the buffer
> >>>> 
> >>>> Temp(1, 2) 
> >>>> 
> >>>> 4. M-x python-ts-mode
> >>>> 5. Call search-subtree with backward flag
> >>>>  M-x eval-expression (treesit-search-subtree
> >>>>              (treesit--thing-at (point) "call")
> >>>>              (lambda (n) (equal (treesit-node-type n ) "integer"))
> >>>>              t)
> >>>> It should return the second int node (#<treesit-node integer in 9-10>), but it returns nil.
> >>> 
> >>> Yuan, any comments to the patch and the issue in general?
> >> 
> >> LGTM. Thanks Denis, and Eli :-)
> > 
> > Should we install this on the emacs-29 branch or on master?
> 
> Emacs-29, I’d say, since it’s a bug fix. Why do you ask?

Because I want to install it, obviously.




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Sun, 19 Nov 2023 09:17:02 GMT) Full text and rfc822 format available.

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

From: Eli Zaretskii <eliz <at> gnu.org>
To: dvzubarev <at> yandex.ru, Yuan Fu <casouri <at> gmail.com>
Cc: 67117 <at> debbugs.gnu.org
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Sun, 19 Nov 2023 11:15:58 +0200
> From: Yuan Fu <casouri <at> gmail.com>
> Date: Sat, 18 Nov 2023 22:13:49 -0800
> Cc: dvzubarev <at> yandex.ru,
>  67117 <at> debbugs.gnu.org
> 
> 
> 
> > On Nov 18, 2023, at 9:47 PM, Eli Zaretskii <eliz <at> gnu.org> wrote:
> > 
> >> From: Yuan Fu <casouri <at> gmail.com>
> >> Date: Sat, 18 Nov 2023 10:47:47 -0800
> >> Cc: Denis Zubarev <dvzubarev <at> yandex.ru>,
> >> 67117 <at> debbugs.gnu.org
> >> 
> >> 
> >>>> Steps to reproduce the issue:
> >>>> 1. emacs -Q
> >>>> 2. M-x find-file /tmp/t.py
> >>>> 3. paste to the buffer
> >>>> 
> >>>> Temp(1, 2) 
> >>>> 
> >>>> 4. M-x python-ts-mode
> >>>> 5. Call search-subtree with backward flag
> >>>>  M-x eval-expression (treesit-search-subtree
> >>>>              (treesit--thing-at (point) "call")
> >>>>              (lambda (n) (equal (treesit-node-type n ) "integer"))
> >>>>              t)
> >>>> It should return the second int node (#<treesit-node integer in 9-10>), but it returns nil.
> >>> 
> >>> Yuan, any comments to the patch and the issue in general?
> >> 
> >> LGTM. Thanks Denis, and Eli :-)
> > 
> > Should we install this on the emacs-29 branch or on master?
> 
> Emacs-29, I’d say, since it’s a bug fix.

I see that the added tests use treesit--thing-at, which is not
available on the emacs-29 branch.  So either we install the tests on
master, or we replace treesit--thing-at in the tests with its body.
WDYT?




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Sun, 19 Nov 2023 11:26:01 GMT) Full text and rfc822 format available.

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

From: Denis Zubarev <dvzubarev <at> yandex.ru>
To: Eli Zaretskii <eliz <at> gnu.org>,
	Yuan Fu <casouri <at> gmail.com>
Cc: "67117 <at> debbugs.gnu.org" <67117 <at> debbugs.gnu.org>
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Sun, 19 Nov 2023 14:25:14 +0300
[Message part 1 (text/html, inline)]
[0002-Fix-an-issue-when-searching-subtree-backward.patch (text/x-diff, attachment)]

Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Sun, 19 Nov 2023 11:46:02 GMT) Full text and rfc822 format available.

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

From: Eli Zaretskii <eliz <at> gnu.org>
To: Denis Zubarev <dvzubarev <at> yandex.ru>
Cc: 67117 <at> debbugs.gnu.org, casouri <at> gmail.com
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Sun, 19 Nov 2023 13:45:03 +0200
> From: Denis Zubarev <dvzubarev <at> yandex.ru>
> Cc: "67117 <at> debbugs.gnu.org" <67117 <at> debbugs.gnu.org>
> Date: Sun, 19 Nov 2023 14:25:14 +0300
> 
> I replaced use of `treesit--thing-at` with `treesit-query-capture`, so it should be compatible with
> emacs-29

Thanks.  Now we need to wait for your copyright assignment paperwork
to complete, which I hope will happen soon, and then we can install
the changeset.




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Tue, 21 Nov 2023 04:24:02 GMT) Full text and rfc822 format available.

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

From: Yuan Fu <casouri <at> gmail.com>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 67117 <at> debbugs.gnu.org, dvzubarev <at> yandex.ru
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Mon, 20 Nov 2023 20:23:33 -0800

> On Nov 18, 2023, at 10:40 PM, Eli Zaretskii <eliz <at> gnu.org> wrote:
> 
>> From: Yuan Fu <casouri <at> gmail.com>
>> Date: Sat, 18 Nov 2023 22:13:49 -0800
>> Cc: dvzubarev <at> yandex.ru,
>> 67117 <at> debbugs.gnu.org
>> 
>> 
>> 
>>> On Nov 18, 2023, at 9:47 PM, Eli Zaretskii <eliz <at> gnu.org> wrote:
>>> 
>>>> From: Yuan Fu <casouri <at> gmail.com>
>>>> Date: Sat, 18 Nov 2023 10:47:47 -0800
>>>> Cc: Denis Zubarev <dvzubarev <at> yandex.ru>,
>>>> 67117 <at> debbugs.gnu.org
>>>> 
>>>> 
>>>>>> Steps to reproduce the issue:
>>>>>> 1. emacs -Q
>>>>>> 2. M-x find-file /tmp/t.py
>>>>>> 3. paste to the buffer
>>>>>> 
>>>>>> Temp(1, 2) 
>>>>>> 
>>>>>> 4. M-x python-ts-mode
>>>>>> 5. Call search-subtree with backward flag
>>>>>> M-x eval-expression (treesit-search-subtree
>>>>>>             (treesit--thing-at (point) "call")
>>>>>>             (lambda (n) (equal (treesit-node-type n ) "integer"))
>>>>>>             t)
>>>>>> It should return the second int node (#<treesit-node integer in 9-10>), but it returns nil.
>>>>> 
>>>>> Yuan, any comments to the patch and the issue in general?
>>>> 
>>>> LGTM. Thanks Denis, and Eli :-)
>>> 
>>> Should we install this on the emacs-29 branch or on master?
>> 
>> Emacs-29, I’d say, since it’s a bug fix. Why do you ask?
> 
> Because I want to install it, obviously.

Of course ;-) I mean you are usually the people who answer this type of questions, and our convention is to install bug fixes on emacs-29, so I was wondering if there’s some other considerations that I don’t know about.

Yuan





Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Tue, 21 Nov 2023 11:44:02 GMT) Full text and rfc822 format available.

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

From: Eli Zaretskii <eliz <at> gnu.org>
To: Yuan Fu <casouri <at> gmail.com>
Cc: 67117 <at> debbugs.gnu.org, dvzubarev <at> yandex.ru
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Tue, 21 Nov 2023 13:43:10 +0200
> From: Yuan Fu <casouri <at> gmail.com>
> Date: Mon, 20 Nov 2023 20:23:33 -0800
> Cc: dvzubarev <at> yandex.ru,
>  67117 <at> debbugs.gnu.org
> 
> >>> Should we install this on the emacs-29 branch or on master?
> >> 
> >> Emacs-29, I’d say, since it’s a bug fix. Why do you ask?
> > 
> > Because I want to install it, obviously.
> 
> Of course ;-) I mean you are usually the people who answer this type of questions, and our convention is to install bug fixes on emacs-29, so I was wondering if there’s some other considerations that I don’t know about.

treesit.c and treesit.el got, and keep getting, significant changes on
the master branch, so when people report bugs for Emacs 30, I cannot
always be sure that the bug exists on the release branch as well, nor
that the patch is appropriate for the release branch (i.e. doesn't
modify code that is different on master).  That's why I asked.




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Sat, 25 Nov 2023 03:46:01 GMT) Full text and rfc822 format available.

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

From: Yuan Fu <casouri <at> gmail.com>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 67117 <at> debbugs.gnu.org, Denis Zubarev <dvzubarev <at> yandex.ru>
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Fri, 24 Nov 2023 19:44:44 -0800

> On Nov 21, 2023, at 3:43 AM, Eli Zaretskii <eliz <at> gnu.org> wrote:
> 
>> From: Yuan Fu <casouri <at> gmail.com>
>> Date: Mon, 20 Nov 2023 20:23:33 -0800
>> Cc: dvzubarev <at> yandex.ru,
>> 67117 <at> debbugs.gnu.org
>> 
>>>>> Should we install this on the emacs-29 branch or on master?
>>>> 
>>>> Emacs-29, I’d say, since it’s a bug fix. Why do you ask?
>>> 
>>> Because I want to install it, obviously.
>> 
>> Of course ;-) I mean you are usually the people who answer this type of questions, and our convention is to install bug fixes on emacs-29, so I was wondering if there’s some other considerations that I don’t know about.
> 
> treesit.c and treesit.el got, and keep getting, significant changes on
> the master branch, so when people report bugs for Emacs 30, I cannot
> always be sure that the bug exists on the release branch as well, nor
> that the patch is appropriate for the release branch (i.e. doesn't
> modify code that is different on master).  That's why I asked.

Ah, right. That makes sense.

Yuan



Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Tue, 19 Dec 2023 00:26:01 GMT) Full text and rfc822 format available.

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

From: Denis Zubarev <dvzubarev <at> yandex.ru>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: "67117 <at> debbugs.gnu.org" <67117 <at> debbugs.gnu.org>,
 "casouri <at> gmail.com" <casouri <at> gmail.com>
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Tue, 19 Dec 2023 03:24:57 +0300
[Message part 1 (text/html, inline)]

Reply sent to Yuan Fu <casouri <at> gmail.com>:
You have taken responsibility. (Tue, 19 Dec 2023 02:27:02 GMT) Full text and rfc822 format available.

Notification sent to Denis Zubarev <dvzubarev <at> yandex.ru>:
bug acknowledged by developer. (Tue, 19 Dec 2023 02:27:02 GMT) Full text and rfc822 format available.

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

From: Yuan Fu <casouri <at> gmail.com>
To: Denis Zubarev <dvzubarev <at> yandex.ru>
Cc: Eli Zaretskii <eliz <at> gnu.org>, 67117-done <at> debbugs.gnu.org
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Mon, 18 Dec 2023 18:26:30 -0800

> On Dec 18, 2023, at 4:24 PM, Denis Zubarev <dvzubarev <at> yandex.ru> wrote:
> 
> Just FYI, my paperwork is done.
> 

Great, applied! Closing this bug.

Yuan




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Tue, 19 Dec 2023 03:25:01 GMT) Full text and rfc822 format available.

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

From: Eli Zaretskii <eliz <at> gnu.org>
To: Denis Zubarev <dvzubarev <at> yandex.ru>
Cc: 67117 <at> debbugs.gnu.org, casouri <at> gmail.com
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Tue, 19 Dec 2023 05:24:16 +0200
> From: Denis Zubarev <dvzubarev <at> yandex.ru>
> Cc: "casouri <at> gmail.com" <casouri <at> gmail.com>,
> 	"67117 <at> debbugs.gnu.org" <67117 <at> debbugs.gnu.org>
> Date: Tue, 19 Dec 2023 03:24:57 +0300
> 
> Just FYI, my paperwork is done.

Yes, I know it for quite some time.




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Tue, 19 Dec 2023 16:54:01 GMT) Full text and rfc822 format available.

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

From: Eli Zaretskii <eliz <at> gnu.org>
To: Yuan Fu <casouri <at> gmail.com>
Cc: 67117 <at> debbugs.gnu.org, dvzubarev <at> yandex.ru
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Tue, 19 Dec 2023 18:52:47 +0200
> From: Yuan Fu <casouri <at> gmail.com>
> Date: Mon, 18 Dec 2023 18:26:30 -0800
> Cc: Eli Zaretskii <eliz <at> gnu.org>,
>  67117-done <at> debbugs.gnu.org
> 
> > On Dec 18, 2023, at 4:24 PM, Denis Zubarev <dvzubarev <at> yandex.ru> wrote:
> > 
> > Just FYI, my paperwork is done.
> > 
> 
> Great, applied! Closing this bug.

The new tests fail here:

    ELC      src/treesit-tests.elc

  In end of data:
  src/treesit-tests.el:1094:17: Warning: the function `treesit--thing-at' is not known to be defined.
  [...]
  Test treesit-search-subtree-backward-1 backtrace:
    (treesit--thing-at (point) "call")
    (treesit-search-subtree (treesit--thing-at (point) "call") #'(lambda
    (let ((node (treesit-search-subtree (treesit--thing-at (point) "call
    (closure (t) nil (let* ((fn-621 #'treesit-language-available-p) (arg
    ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
    ert-run-test(#s(ert-test :name treesit-search-subtree-backward-1 :do
    ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
    ert-run-tests((not (or (tag :unstable) (tag :nativecomp))) #f(compil
    ert-run-tests-batch((not (or (tag :unstable) (tag :nativecomp))))
    ert-run-tests-batch-and-exit((not (or (tag :unstable) (tag :nativeco
    eval((ert-run-tests-batch-and-exit '(not (or (tag :unstable) (tag :n
    command-line-1(("-L" ";." "-l" "ert" "-l" "src/treesit-tests.el" "--
    command-line()
    normal-top-level()
  Test treesit-search-subtree-backward-1 condition:
      (void-function treesit--thing-at)
     FAILED  24/25  treesit-search-subtree-backward-1 (0.000000 sec) at src/treesit-tests.el:1100
  Can't guess python-indent-offset, using defaults: 4
  Test treesit-search-subtree-forward-1 backtrace:
    (treesit--thing-at (point) "call")
    (treesit-search-subtree (treesit--thing-at (point) "call") #'(lambda
    (let ((node (treesit-search-subtree (treesit--thing-at (point) "call
    (closure (t) nil (let* ((fn-609 #'treesit-language-available-p) (arg
    ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
    ert-run-test(#s(ert-test :name treesit-search-subtree-forward-1 :doc
    ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
    ert-run-tests((not (or (tag :unstable) (tag :nativecomp))) #f(compil
    ert-run-tests-batch((not (or (tag :unstable) (tag :nativecomp))))
    ert-run-tests-batch-and-exit((not (or (tag :unstable) (tag :nativeco
    eval((ert-run-tests-batch-and-exit '(not (or (tag :unstable) (tag :n
    command-line-1(("-L" ";." "-l" "ert" "-l" "src/treesit-tests.el" "--
    command-line()
    normal-top-level()
  Test treesit-search-subtree-forward-1 condition:
      (void-function treesit--thing-at)
     FAILED  25/25  treesit-search-subtree-forward-1 (0.015625 sec) at src/treesit-tests.el:1086

The function treesit--thing-at is only available on master.




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Tue, 19 Dec 2023 17:09:02 GMT) Full text and rfc822 format available.

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

From: Denis Zubarev <dvzubarev <at> yandex.ru>
To: Eli Zaretskii <eliz <at> gnu.org>,
	Yuan Fu <casouri <at> gmail.com>
Cc: "67117 <at> debbugs.gnu.org" <67117 <at> debbugs.gnu.org>
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Tue, 19 Dec 2023 20:08:04 +0300
[Message part 1 (text/html, inline)]
[0002-Fix-an-issue-when-searching-subtree-backward.patch (text/x-diff, attachment)]

Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Sat, 23 Dec 2023 07:10:02 GMT) Full text and rfc822 format available.

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

From: Yuan Fu <casouri <at> gmail.com>
To: Denis Zubarev <dvzubarev <at> yandex.ru>
Cc: "67117 <at> debbugs.gnu.org" <67117 <at> debbugs.gnu.org>,
 Eli Zaretskii <eliz <at> gnu.org>
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Fri, 22 Dec 2023 23:09:24 -0800

> On Dec 19, 2023, at 9:08 AM, Denis Zubarev <dvzubarev <at> yandex.ru> wrote:
> 
> I replaced treesit--thing-at with the function from emacs 29.1 in the last version of the patch.
>  Attached it here.
>    19.12.2023, 19:53, "Eli Zaretskii" <eliz <at> gnu.org>:
>  From: Yuan Fu <casouri <at> gmail.com>
>  Date: Mon, 18 Dec 2023 18:26:30 -0800
>  Cc: Eli Zaretskii <eliz <at> gnu.org>,
>   67117-done <at> debbugs.gnu.org
>  
>  > On Dec 18, 2023, at 4:24 PM, Denis Zubarev <dvzubarev <at> yandex.ru> wrote:
>  >
>  > Just FYI, my paperwork is done.
>  >
>  
>  Great, applied! Closing this bug.
> 
> The new tests fail here:
> 
>     ELC src/treesit-tests.elc
> 
>   In end of data:
>   src/treesit-tests.el:1094:17: Warning: the function `treesit--thing-at' is not known to be defined.
>   [...]
>   Test treesit-search-subtree-backward-1 backtrace:
>     (treesit--thing-at (point) "call")
>     (treesit-search-subtree (treesit--thing-at (point) "call") #'(lambda
>     (let ((node (treesit-search-subtree (treesit--thing-at (point) "call
>     (closure (t) nil (let* ((fn-621 #'treesit-language-available-p) (arg
>     ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
>     ert-run-test(#s(ert-test :name treesit-search-subtree-backward-1 :do
>     ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
>     ert-run-tests((not (or (tag :unstable) (tag :nativecomp))) #f(compil
>     ert-run-tests-batch((not (or (tag :unstable) (tag :nativecomp))))
>     ert-run-tests-batch-and-exit((not (or (tag :unstable) (tag :nativeco
>     eval((ert-run-tests-batch-and-exit '(not (or (tag :unstable) (tag :n
>     command-line-1(("-L" ";." "-l" "ert" "-l" "src/treesit-tests.el" "--
>     command-line()
>     normal-top-level()
>   Test treesit-search-subtree-backward-1 condition:
>       (void-function treesit--thing-at)
>      FAILED 24/25 treesit-search-subtree-backward-1 (0.000000 sec) at src/treesit-tests.el:1100
>   Can't guess python-indent-offset, using defaults: 4
>   Test treesit-search-subtree-forward-1 backtrace:
>     (treesit--thing-at (point) "call")
>     (treesit-search-subtree (treesit--thing-at (point) "call") #'(lambda
>     (let ((node (treesit-search-subtree (treesit--thing-at (point) "call
>     (closure (t) nil (let* ((fn-609 #'treesit-language-available-p) (arg
>     ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
>     ert-run-test(#s(ert-test :name treesit-search-subtree-forward-1 :doc
>     ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
>     ert-run-tests((not (or (tag :unstable) (tag :nativecomp))) #f(compil
>     ert-run-tests-batch((not (or (tag :unstable) (tag :nativecomp))))
>     ert-run-tests-batch-and-exit((not (or (tag :unstable) (tag :nativeco
>     eval((ert-run-tests-batch-and-exit '(not (or (tag :unstable) (tag :n
>     command-line-1(("-L" ";." "-l" "ert" "-l" "src/treesit-tests.el" "--
>     command-line()
>     normal-top-level()
>   Test treesit-search-subtree-forward-1 condition:
>       (void-function treesit--thing-at)
>      FAILED 25/25 treesit-search-subtree-forward-1 (0.015625 sec) at src/treesit-tests.el:1086
> 
> The function treesit--thing-at is only available on master.<0002-Fix-an-issue-when-searching-subtree-backward.patch>

Thanks, applied this patch, and all tests pass now.

Yuan





Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#67117; Package emacs. (Tue, 26 Dec 2023 00:40:02 GMT) Full text and rfc822 format available.

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

From: Yuan Fu <casouri <at> gmail.com>
To: Denis Zubarev <dvzubarev <at> yandex.ru>
Cc: Eli Zaretskii <eliz <at> gnu.org>, 67117-done <at> debbugs.gnu.org
Subject: Re: bug#67117: [PATCH] Tree-sitter: fix an issue when searching
 subtree backward
Date: Mon, 25 Dec 2023 16:39:13 -0800
> 
> Thanks, applied this patch, and all tests pass now.
> 
> Yuan
> 

Closing this report.

Yuan




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 23 Jan 2024 12:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 1 year and 108 days ago.

Previous Next


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