[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/tree-sitter 1575ee2eeb 07/15: Accept nil as NODE in treesit-node
From: |
Yuan Fu |
Subject: |
feature/tree-sitter 1575ee2eeb 07/15: Accept nil as NODE in treesit-node-text |
Date: |
Sun, 25 Sep 2022 00:11:59 -0400 (EDT) |
branch: feature/tree-sitter
commit 1575ee2eeb1ebb5b73b4b76fc7dc7f5702748540
Author: Yuan Fu <casouri@gmail.com>
Commit: Yuan Fu <casouri@gmail.com>
Accept nil as NODE in treesit-node-text
* lisp/treesit.el (treesit-node-text): Just wrap function body
in (when ...).
---
lisp/treesit.el | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 9750ac7b7b..28a74657f9 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -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.
- feature/tree-sitter 17422c2cfc 06/15: ; * src/treesit.c (Ftreesit_node_field_name_for_child): Doc fix., (continued)
- feature/tree-sitter 17422c2cfc 06/15: ; * src/treesit.c (Ftreesit_node_field_name_for_child): Doc fix., Yuan Fu, 2022/09/25
- feature/tree-sitter eba6582436 09/15: Add the treesit-search functions that supplant the removed ones, Yuan Fu, 2022/09/25
- feature/tree-sitter a31538ea5b 12/15: Fix treesit-search-forward, Yuan Fu, 2022/09/25
- feature/tree-sitter ef6e18a6b9 13/15: Improve treesit-search-forward-goto, Yuan Fu, 2022/09/25
- feature/tree-sitter 9e339415b4 14/15: Fix treesit-induce-sparse-tree, Yuan Fu, 2022/09/25
- feature/tree-sitter c5147882a9 03/15: ; Minor manual fix for tree-sitter indent, Yuan Fu, 2022/09/25
- feature/tree-sitter 914f68da05 04/15: ; Minor tree-sitter manual fix, Yuan Fu, 2022/09/25
- feature/tree-sitter 013c7d6aae 01/15: Rename treesit-expand-query/pattern, Yuan Fu, 2022/09/25
- feature/tree-sitter 9ed53535f5 15/15: ; * lisp/progmodes/python.el (python-mode): Fix typo., Yuan Fu, 2022/09/25
- feature/tree-sitter 08a1c32d0b 02/15: Improve printing treesit nodes, Yuan Fu, 2022/09/25
- feature/tree-sitter 1575ee2eeb 07/15: Accept nil as NODE in treesit-node-text,
Yuan Fu <=
- feature/tree-sitter f071e61d10 10/15: ; Fix docstrings in treesit.el, Yuan Fu, 2022/09/25
- feature/tree-sitter 795e01ac24 11/15: Update and enable treesit-imenu function in python.el, Yuan Fu, 2022/09/25