From: Yuan Fu <casouri@gmail.com>
Date: Mon, 10 Oct 2022 18:00:51 +0000 (-0700)
Subject: * admin/notes/tree-sitter/starter-guide (Navigation): Improve demo.
X-Git-Tag: emacs-29.0.90~1844
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f6b017e3dc646d317b56fb453c90aaa44c27089;p=emacs.git

* admin/notes/tree-sitter/starter-guide (Navigation): Improve demo.
---

diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide
index 378ff581afa..e5736038622 100644
--- a/admin/notes/tree-sitter/starter-guide
+++ b/admin/notes/tree-sitter/starter-guide
@@ -350,24 +350,38 @@ node.
 Something like this should suffice:
 
 #+begin_src elisp
-(defun xxx-beginning-of-defun (&optional arg)
-  (if (> arg 0)
-      ;; Go backward.
+(defun js--treesit-beginning-of-defun (&optional arg)
+  (let ((arg (or arg 1)))
+    (if (> arg 0)
+        ;; Go backward.
+        (while (and (> arg 0)
+                    (treesit-search-forward-goto
+                     "function_definition" 'start nil t))
+          (setq arg (1- arg)))
+      ;; Go forward.
+      (while (and (< arg 0)
+                  (treesit-search-forward-goto
+                   "function_definition" 'start))
+        (setq arg (1+ arg))))))
+
+(defun xxx-end-of-defun (&optional arg)
+  (let ((arg (or arg 1)))
+    (if (< arg 0)
+        ;; Go backward.
+        (while (and (< arg 0)
+                    (treesit-search-forward-goto
+                     "function_definition" 'end nil t))
+          (setq arg (1+ arg)))
+      ;; Go forward.
       (while (and (> arg 0)
                   (treesit-search-forward-goto
-                   "function_definition" 'start nil t))
-        (setq arg (1- arg)))
-    ;; Go forward.
-    (while (and (< arg 0)
-                (treesit-search-forward-goto
-                 "function_definition" 'start))
-      (setq arg (1+ arg)))))
+                   "function_definition" 'end))
+        (setq arg (1- arg))))))
 
 (setq-local beginning-of-defun-function #'xxx-beginning-of-defun)
+(setq-local end-of-defun-function #'xxx-end-of-defun)
 #+end_src
 
-And the same for end-of-defun.
-
 * Which-func
 
 You can find the current function by going up the tree and looking for