From: Dmitry Gutov <dmitry@gutov.dev>
To: JD Smith <jdtsmith@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: Tree-sitter navigation time grows as sqrt(line-number)
Date: Thu, 17 Aug 2023 16:19:37 +0300 [thread overview]
Message-ID: <6db52945-5459-197c-405d-153ff395a824@gutov.dev> (raw)
In-Reply-To: <f40bd17b-ce72-d76d-4708-b0956c716513@gutov.dev>
On 17/08/2023 15:34, Dmitry Gutov wrote:
> On 17/08/2023 15:21, JD Smith wrote:
>> I provided the test code and target file in the hopes that others
>> could confirm the scaling behavior and then experiment with algorithm
>> tweaks, if anything obvious presented itself.
>
> I experimented a little bit with benchmarking (treesit-node-parent)
> calls, and the patch came from that.
In case somebody else here wants to try it:
diff --git a/src/treesit.c b/src/treesit.c
index 1f694e47201..4b35e5ee2e5 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -52,6 +52,7 @@ Copyright (C) 2021-2023 Free Software Foundation, Inc.
#undef ts_node_named_descendant_for_byte_range
#undef ts_node_next_named_sibling
#undef ts_node_next_sibling
+#undef ts_node_parent
#undef ts_node_prev_named_sibling
#undef ts_node_prev_sibling
#undef ts_node_start_byte
@@ -1899,16 +1900,27 @@ DEFUN ("treesit-node-parent",
TSNode treesit_node = XTS_NODE (node)->node;
Lisp_Object parser = XTS_NODE (node)->parser;
- TSTreeCursor cursor;
- if (!treesit_cursor_helper (&cursor, treesit_node, parser))
- return return_value;
- if (ts_tree_cursor_goto_parent (&cursor))
- {
- TSNode parent = ts_tree_cursor_current_node (&cursor);
- return_value = make_treesit_node (parser, parent);
- }
- ts_tree_cursor_delete (&cursor);
+ if (treesit_node_uptodate_p(node))
+ {
+ TSNode parent = ts_node_parent (treesit_node);
+ return_value = make_treesit_node (parser, parent);
+ }
+ else
+ {
+ Lisp_Object parser = XTS_NODE (node)->parser;
+ TSTreeCursor cursor;
+ if (!treesit_cursor_helper (&cursor, treesit_node, parser))
+ return return_value;
+
+ if (ts_tree_cursor_goto_parent (&cursor))
+ {
+ TSNode parent = ts_tree_cursor_current_node (&cursor);
+ return_value = make_treesit_node (parser, parent);
+ }
+ ts_tree_cursor_delete (&cursor);
+ }
+
return return_value;
}
next prev parent reply other threads:[~2023-08-17 13:19 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-17 4:01 Tree-sitter navigation time grows as sqrt(line-number) JD Smith
2023-08-17 10:56 ` Dmitry Gutov
2023-08-17 11:41 ` Eli Zaretskii
2023-08-17 11:51 ` tomas
2023-08-17 12:21 ` JD Smith
2023-08-17 12:34 ` Dmitry Gutov
2023-08-17 13:19 ` Dmitry Gutov [this message]
2023-08-19 14:24 ` JD Smith
2023-08-19 22:16 ` Yuan Fu
2023-08-20 0:18 ` JD Smith
2023-08-20 0:39 ` Dmitry Gutov
2023-08-20 2:01 ` Yuan Fu
2023-08-20 12:40 ` JD Smith
2023-08-20 20:26 ` Dmitry Gutov
2023-08-22 1:41 ` Yuan Fu
2023-08-22 21:07 ` JD Smith
2023-08-31 4:26 ` Yuan Fu
2023-08-31 6:03 ` Eli Zaretskii
2023-08-31 11:04 ` Dmitry Gutov
2023-08-31 11:42 ` Po Lu
2023-08-31 17:32 ` Dmitry Gutov
2023-08-31 12:51 ` Eli Zaretskii
2023-08-31 13:58 ` JD Smith
2023-08-31 17:49 ` Dmitry Gutov
2023-08-31 19:03 ` Yuan Fu
2023-08-31 19:06 ` Eli Zaretskii
2023-08-31 20:24 ` Stefan Kangas
2023-09-01 5:33 ` Eli Zaretskii
2023-08-20 6:18 ` Eli Zaretskii
2023-08-18 3:00 ` Yuan Fu
2023-08-18 4:19 ` JD Smith
2023-08-18 5:20 ` Yuan Fu
2023-08-18 13:21 ` Dmitry Gutov
2023-08-18 13:39 ` JD Smith
[not found] <87v8ddsqwe.fsf@web.de>
2023-08-17 14:25 ` Dmitry Gutov
2023-08-17 14:36 ` Dmitry Gutov
2023-08-17 15:01 ` Dmitry Gutov
2023-08-17 15:15 ` Felix
2023-08-18 2:49 ` Yuan Fu
2023-08-18 13:29 ` 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=6db52945-5459-197c-405d-153ff395a824@gutov.dev \
--to=dmitry@gutov.dev \
--cc=emacs-devel@gnu.org \
--cc=jdtsmith@gmail.com \
/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).