From: Wilhelm H Kirschbaum <wkirschbaum@gmail.com>
To: 60355@debbugs.gnu.org
Subject: bug#60355: 29.0.60; Tree sitter incorrectly handles of PRED for treesit-defun-type-regexp
Date: Tue, 27 Dec 2022 14:09:29 +0200 [thread overview]
Message-ID: <87cz85yqx2.fsf@gmail.com> (raw)
When `treesit-defun-type-regexp` is set with a cons cell (regexp .
some-pred)
the following case does not get handled as expected when calling
(end-of-defun):
```elixir
defmodule Example do
def foo() do ; regexp match, pred match
end
;; <point here>
@impl true ; regexp match, pred does not match
def bar() do ; regexp match, pred match
end
;; <should jump to here>
def baz() do
end
end
;; <jumps to point here>
```
The function `treesit--things-around` only looks at the PRED after
it searches forward and
would then not be aware of the non matching node. The following
change works for my case
where search-forward takes in the PRED, not just the regexp:
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 2130cd0061..7997509f50 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1776,7 +1776,13 @@ treesit--things-around
node "" nil nil t))
node))
(result (list nil nil nil))
- (pred (or pred (lambda (_) t))))
+ (pred (if (null pred)
+ (lambda (node)
+ (string-match-p regexp (treesit-node-type
node)))
+ (lambda (node)
+ (and (string-match-p regexp (treesit-node-type
node))
+ (funcall pred node))))))
+
;; 1. Find previous and next sibling defuns.
(cl-loop
for idx from 0 to 1
@@ -1798,12 +1804,10 @@ treesit--things-around
do (cl-loop for cursor = (when node
(save-excursion
(treesit-search-forward
- node regexp backward
backward)))
+ node pred backward backward)))
then (treesit-node-parent cursor)
while cursor
- if (and (string-match-p
- regexp (treesit-node-type cursor))
- (funcall pred cursor)
+ if (and (funcall pred cursor)
(funcall pos-pred cursor))
do (setf (nth idx result) cursor)))
;; 2. Find the parent defun.
Hope this makes sense,
Wilhelm
ps. Sorry about the email swapping, think it should be fixed now.
next reply other threads:[~2022-12-27 12:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-27 12:09 Wilhelm H Kirschbaum [this message]
2022-12-28 1:47 ` bug#60355: 29.0.60; Tree sitter incorrectly handles of PRED for treesit-defun-type-regexp Yuan Fu
2022-12-28 6:31 ` Wilhelm H Kirschbaum
2022-12-28 8:34 ` Yuan Fu
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87cz85yqx2.fsf@gmail.com \
--to=wkirschbaum@gmail.com \
--cc=60355@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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.