From: Juri Linkov <juri@linkov.net>
Date: Thu, 13 Mar 2025 18:44:54 +0000 (+0200)
Subject: Handle narrowed buffers in treesit-forward-sentence (bug#76679)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6943de8aeb9b35d943d61121e617121c9f4fcf06;p=emacs.git

Handle narrowed buffers in treesit-forward-sentence (bug#76679)

* lisp/treesit.el (treesit-forward-sentence): When no more
sentences are found, move to the end of the buffer or to
the range boundary at the 'treesit-parser' overlay's end.

(cherry picked from commit 59a67dcde4ecf8b8c346164f2d2cf90905762350)
---

diff --git a/lisp/treesit.el b/lisp/treesit.el
index c5a174e94ae..97551394601 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -3410,9 +3410,16 @@ What constitutes as text and source code sentence is determined
 by `text' and `sentence' in `treesit-thing-settings'."
   (if (treesit-node-match-p (treesit-node-at (point)) 'text t)
       (funcall #'forward-sentence-default-function arg)
-    (funcall
-     (if (> arg 0) #'treesit-end-of-thing #'treesit-beginning-of-thing)
-     'sentence (abs arg))))
+    (or (funcall
+         (if (> arg 0) #'treesit-end-of-thing #'treesit-beginning-of-thing)
+         'sentence (abs arg))
+        ;; On failure jump to the buffer's end as `forward-sentence' does,
+        ;; but no further than the boundary of the current range.
+        (goto-char (if (> arg 0)
+                       (min (point-max) (next-single-char-property-change
+                                         (point) 'treesit-parser))
+                     (max (point-min) (previous-single-char-property-change
+                                       (point) 'treesit-parser)))))))
 
 (defun treesit-forward-comment (&optional count)
   "Tree-sitter `forward-comment-function' implementation.