[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 683c7c96871: Increment parser timestamp when narrowing changes

From: Yuan Fu
Subject: emacs-29 683c7c96871: Increment parser timestamp when narrowing changes (bug#67977)
Date: Sat, 23 Dec 2023 21:44:04 -0500 (EST)

branch: emacs-29
commit 683c7c96871cc374b0e00f5084e43a70fc3ec36a
Author: Yuan Fu <casouri@gmail.com>
Commit: Yuan Fu <casouri@gmail.com>

    Increment parser timestamp when narrowing changes (bug#67977)
    When narrowing changes, parse reparses, so the timestamp should
    definitely increment, just like in ts_record_changes.
    Failing to increment this timestamp, outdated nodes would think they
    are still up-to-date, and try to print their type name.  Printing
    their type name involves accessing the old parse tree, which is
    already freed during the last reparse.
    I also found that we don't increment timestamp when changing parser
    ranges and fixed that as well.
    * src/treesit.c (treesit_sync_visible_region):
    (Ftreesit_parser_set_included_ranges): Increment timestamp.
    * src/treesit.h (Lisp_TS_Parser): Add some comments.
 src/treesit.c | 6 +++++-
 src/treesit.h | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/treesit.c b/src/treesit.c
index 93ed97212d7..879405e551a 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -931,7 +931,10 @@ treesit_sync_visible_region (Lisp_Object parser)
      this function is called), we need to reparse.  */
   if (visible_beg != BUF_BEGV_BYTE (buffer)
       || visible_end != BUF_ZV_BYTE (buffer))
-    XTS_PARSER (parser)->need_reparse = true;
+    {
+      XTS_PARSER (parser)->need_reparse = true;
+      XTS_PARSER (parser)->timestamp++;
+    }
   /* Before we parse or set ranges, catch up with the narrowing
      situation.  We change visible_beg and visible_end to match
@@ -1671,6 +1674,7 @@ buffer.  */)
   XTS_PARSER (parser)->need_reparse = true;
+  XTS_PARSER (parser)->timestamp++;
   return Qnil;
diff --git a/src/treesit.h b/src/treesit.h
index 5382bc58817..3d59262b53a 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -53,7 +53,9 @@ struct Lisp_TS_Parser
   /* Re-parsing an unchanged buffer is not free for tree-sitter, so we
      only make it re-parse when need_reparse == true.  That usually
      means some change is made in the buffer.  But others could set
-     this field to true to force tree-sitter to re-parse.  */
+     this field to true to force tree-sitter to re-parse.  When you
+     set this to true, you should _always_ also increment
+     timestamp.  */
   bool need_reparse;
   /* These two positions record the buffer byte position (1-based) of
      the "visible region" that tree-sitter sees.  Before re-parse, we

reply via email to

[Prev in Thread] Current Thread [Next in Thread]