aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuan Fu2023-03-24 00:17:10 -0700
committerYuan Fu2023-03-24 00:18:19 -0700
commit33d436eefa16dfd4cf53bd53fdd764b2896c649c (patch)
treeab1488544e46042b45df8cf35dd3ab95b3dd15fb
parentd93a439846f03dfb2be28d6b5c2e963ef6be0c22 (diff)
downloademacs-33d436eefa16dfd4cf53bd53fdd764b2896c649c.tar.gz
emacs-33d436eefa16dfd4cf53bd53fdd764b2896c649c.zip
Fix treesit_ensure_parsed (bug#62333)
* src/treesit.c (treesit_ensure_parsed): Check for need_reparse after treesit_sync_visible_region runs, because as the comment says, treesit_sync_visible_region might modify need_reparse.
-rw-r--r--src/treesit.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/treesit.c b/src/treesit.c
index 5a4fe3e8803..1bb52888f4b 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1016,11 +1016,6 @@ treesit_call_after_change_functions (TSTree *old_tree, TSTree *new_tree,
1016static void 1016static void
1017treesit_ensure_parsed (Lisp_Object parser) 1017treesit_ensure_parsed (Lisp_Object parser)
1018{ 1018{
1019 /* Make sure this comes before everything else, see comment
1020 (ref:notifier-inside-ensure-parsed) for more detail. */
1021 if (!XTS_PARSER (parser)->need_reparse)
1022 return;
1023
1024 struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer); 1019 struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
1025 1020
1026 /* Before we parse, catch up with the narrowing situation. */ 1021 /* Before we parse, catch up with the narrowing situation. */
@@ -1029,6 +1024,11 @@ treesit_ensure_parsed (Lisp_Object parser)
1029 because it might set the flag to true. */ 1024 because it might set the flag to true. */
1030 treesit_sync_visible_region (parser); 1025 treesit_sync_visible_region (parser);
1031 1026
1027 /* Make sure this comes before everything else, see comment
1028 (ref:notifier-inside-ensure-parsed) for more detail. */
1029 if (!XTS_PARSER (parser)->need_reparse)
1030 return;
1031
1032 TSParser *treesit_parser = XTS_PARSER (parser)->parser; 1032 TSParser *treesit_parser = XTS_PARSER (parser)->parser;
1033 TSTree *tree = XTS_PARSER (parser)->tree; 1033 TSTree *tree = XTS_PARSER (parser)->tree;
1034 TSInput input = XTS_PARSER (parser)->input; 1034 TSInput input = XTS_PARSER (parser)->input;