From c1c2d524b6f78126a1ae32b9104f4191bb0bdab1 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 11 Mar 2025 20:18:24 +0200 Subject: [PATCH] Adapt treesit-outline-search to the recent improvements (bug#76398) * lisp/treesit.el (treesit-closest-parser-boundary): Remove temporary function. (treesit-outline-search): Use 'previous/next-single-char-property-change' with 'treesit-parser' property to find the closest parser boundary. (treesit-outline-level): Get the 'treesit-host-parser' overlay and find the parent parser node with 'treesit-node-at'. (cherry picked from commit b741023070e6cfb03a178cab0f6818244af1b0e2) --- lisp/treesit.el | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/lisp/treesit.el b/lisp/treesit.el index 2430a9c5e19..2cb2ae5c545 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -3938,18 +3938,6 @@ this variable takes priority.") (or (and current-valid current) (and next-valid (treesit-thing-at next pred))))) -(defun treesit-closest-parser-boundary (pos backward) - "Get the closest boundary of a local parser." - (when-let* ((ranges (mapcar #'treesit-parser-included-ranges - (treesit-parser-list))) - (ranges (delq nil (delete '((1 . 1)) ranges))) - (bounds (seq-filter - (lambda (p) (if backward (< p pos) (> p pos))) - (flatten-list ranges))) - (closest (when bounds - (if backward (seq-max bounds) (seq-min bounds))))) - closest)) - (defun treesit-outline-search (&optional bound move backward looking-at recursive) "Search for the next outline heading in the syntax tree. For BOUND, MOVE, BACKWARD, LOOKING-AT, see the descriptions in @@ -3975,10 +3963,15 @@ For BOUND, MOVE, BACKWARD, LOOKING-AT, see the descriptions in treesit-outline-predicate)) (found (or bob-pos (treesit-navigate-thing pos (if backward -1 1) 'beg pred))) - (closest (treesit-closest-parser-boundary pos backward))) + (closest (unless bob-pos + (if backward + (previous-single-char-property-change pos 'treesit-parser) + (next-single-char-property-change pos 'treesit-parser))))) ;; Handle multi-language modes - (if (and closest (not recursive) + (if (and closest + (not (eq closest (if backward (point-min) (point-max)))) + (not recursive) (or ;; Possibly was inside the local parser, and when can't find ;; more matches inside it then need to go over the closest @@ -4011,21 +4004,21 @@ For BOUND, MOVE, BACKWARD, LOOKING-AT, see the descriptions in "Return the depth of the current outline heading." (let* ((node (treesit-outline--at-point)) (level 1) - (parser (when (and treesit-aggregated-outline-predicate node) - (treesit-node-parser node))) (pred (if treesit-aggregated-outline-predicate (alist-get (treesit-language-at (point)) treesit-aggregated-outline-predicate) treesit-outline-predicate))) (while (setq node (treesit-parent-until node pred)) (setq level (1+ level))) - (when-let* ((_ (and parser (not (eq parser treesit-primary-parser)))) - (guest-root-node (treesit-parser-root-node parser)) - (host-lang (treesit-parser-language treesit-primary-parser)) - (host-pred (alist-get host-lang treesit-aggregated-outline-predicate))) - ;; Continue from the host node that contains the guest parser. - (setq node (treesit-node-at (- (treesit-node-start guest-root-node) 2))) - (while (setq node (treesit-parent-until node host-pred)) + ;; Continue counting from the host node. + (when-let* ((parser + (when treesit-aggregated-outline-predicate + (seq-some (lambda (o) (overlay-get o 'treesit-host-parser)) + (overlays-at (point))))) + (node (treesit-node-at (point) parser)) + (lang (treesit-parser-language parser)) + (pred (alist-get lang treesit-aggregated-outline-predicate))) + (while (setq node (treesit-parent-until node pred)) (setq level (1+ level)))) level)) -- 2.39.5