]> git.eshelyaron.com Git - emacs.git/commitdiff
Accept nil as NODE in treesit-node-text
authorYuan Fu <casouri@gmail.com>
Sun, 25 Sep 2022 02:24:06 +0000 (19:24 -0700)
committerYuan Fu <casouri@gmail.com>
Sun, 25 Sep 2022 04:11:30 +0000 (21:11 -0700)
* lisp/treesit.el (treesit-node-text): Just wrap function body
in (when ...).

lisp/treesit.el

index 9750ac7b7b943fbf40b403e858e85362f6fd93e2..28a74657f9d04dbb7d533ecd8a4491b3ca4de693 100644 (file)
@@ -172,14 +172,15 @@ NAMED non-nil, only search for named node."
 (defun treesit-node-text (node &optional no-property)
   "Return the buffer (or string) content corresponding to NODE.
 If NO-PROPERTY is non-nil, remove text properties."
-  (with-current-buffer (treesit-node-buffer node)
-    (if no-property
-        (buffer-substring-no-properties
+  (when node
+    (with-current-buffer (treesit-node-buffer node)
+      (if no-property
+          (buffer-substring-no-properties
+           (treesit-node-start node)
+           (treesit-node-end node))
+        (buffer-substring
          (treesit-node-start node)
-         (treesit-node-end node))
-      (buffer-substring
-       (treesit-node-start node)
-       (treesit-node-end node)))))
+         (treesit-node-end node))))))
 
 (defun treesit-parent-until (node pred)
   "Return the closest parent of NODE that satisfies PRED.