mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

Fix treesit_sync_visible_region's range fixup code (bug#73264)

Browse Source 
new_ranges_head
      |
      v
( )->( )->( )->( )->( )
           ^    ^
           |    |
           |    lisp_ranges (loop head)
           |
           prev_cons -> set cdr to nil to cut of the rest

result:

     ( )->( )

* src/treesit.c (treesit_sync_visible_region): Cut off this cons and the
rest, not set the current range's end to nil.
* test/src/treesit-tests.el:
(treesit-range-fixup-after-edit): Add tests for all cases.
This commit is contained in:
Yuan Fu 2024-09-15 00:24:03 -07:00
parent 81347c1aaf
commit 460b9d705a
No known key found for this signature in database
GPG Key ID: 56E19BC57664A442
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/treesit.c
View File

@ -1064,6 +1064,7 @@ treesit_sync_visible_region (Lisp_Object parser)
if (NILP (lisp_ranges)) return; if (NILP (lisp_ranges)) return;
Lisp_Object new_ranges_head = lisp_ranges; Lisp_Object new_ranges_head = lisp_ranges;
Lisp_Object prev_cons = Qnil;
FOR_EACH_TAIL_SAFE (lisp_ranges) FOR_EACH_TAIL_SAFE (lisp_ranges)
{ {
@ -1076,9 +1077,12 @@ treesit_sync_visible_region (Lisp_Object parser)
new_ranges_head = XCDR (new_ranges_head); new_ranges_head = XCDR (new_ranges_head);
else if (beg >= visible_end) else if (beg >= visible_end)
{ {
/* Even the beg is after visible_end, dicard this range and all /* Even the beg is after visible_end, discard this range and all
the ranges after it. */ the ranges after it. */
XSETCDR (range, Qnil); if (NILP (prev_cons))
new_ranges_head = Qnil;
else
XSETCDR (prev_cons, Qnil);
break; break;
} }
else else
@ -1091,12 +1095,18 @@ treesit_sync_visible_region (Lisp_Object parser)
if (end > visible_end) if (end > visible_end)
XSETCDR (range, make_fixnum (visible_end)); XSETCDR (range, make_fixnum (visible_end));
} }
prev_cons = lisp_ranges;
} }
XTS_PARSER (parser)->last_set_ranges = new_ranges_head; XTS_PARSER (parser)->last_set_ranges = new_ranges_head;
if (NILP (new_ranges_head)) if (NILP (new_ranges_head))
{ {
/* We are in a weird situation here: none of the previous ranges
overlaps with the new visible region. We don't have any good
options, so just throw the towel: just remove ranges and hope
lisp world will soon update with reasonable ranges or just
delete this parser. */
bool success; bool success;
success = ts_parser_set_included_ranges (XTS_PARSER (parser)->parser, success = ts_parser_set_included_ranges (XTS_PARSER (parser)->parser,
NULL, 0); NULL, 0);

32
test/src/treesit-tests.el
View File

@ -709,7 +709,37 @@ visible_end.)"
'((1 . 7) (10 . 15)))) '((1 . 7) (10 . 15))))
(narrow-to-region 5 13) (narrow-to-region 5 13)
(should (equal (treesit-parser-included-ranges parser) (should (equal (treesit-parser-included-ranges parser)
'((5 . 7) (10 . 13))))))) '((5 . 7) (10 . 13))))
;; Narrow in front.
(widen)
(treesit-parser-set-included-ranges parser '((4 . 17)))
;; 11111111111111111111
;; [ ]
;; { } narrow
(narrow-to-region 1 8)
(should (equal (treesit-parser-included-ranges parser)
'((4 . 8))))
;; Narrow in back.
(widen)
(treesit-parser-set-included-ranges parser '((4 . 17)))
;; 11111111111111111111
;; [ ]
;; { } narrow
(narrow-to-region 15 20)
(should (equal (treesit-parser-included-ranges parser)
'((15 . 17))))
;; No overlap
(widen)
(treesit-parser-set-included-ranges parser '((15 . 20)))
;; 11111111111111111111
;; [ ]
;; { } narrow
(narrow-to-region 1 10)
(should (equal (treesit-parser-included-ranges parser)
nil)))))
;;; Multiple language ;;; Multiple language