branch: elpa/treesit-fold
commit 54d6b693780b64d4a0d491e25463d7059fcef483
Author: JenChieh <[email protected]>
Commit: JenChieh <[email protected]>
fix: Port error from ts-fold
---
treesit-fold-util.el | 8 ++++----
treesit-fold.el | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/treesit-fold-util.el b/treesit-fold-util.el
index df38d4513e..f0ce10d72f 100644
--- a/treesit-fold-util.el
+++ b/treesit-fold-util.el
@@ -144,14 +144,14 @@ Optional argument TRIM, see function
`treesit-fold--get-face'."
(goto-char pos)
(current-indentation))
-(defun treesit-fold--node-start-position (node)
- "Return NODE's start position."
+(defun treesit-fold--node-start-point (node)
+ "Return NODE's start point."
(save-excursion
(goto-char (treesit-node-start node))
(cons (line-number-at-pos) (current-column))))
-(defun treesit-fold--node-end-position (node)
- "Return NODE's end position."
+(defun treesit-fold--node-end-point (node)
+ "Return NODE's end point."
(save-excursion
(goto-char (treesit-node-end node))
(cons (line-number-at-pos) (current-column))))
diff --git a/treesit-fold.el b/treesit-fold.el
index ec19cc5b69..3aaab11b7d 100644
--- a/treesit-fold.el
+++ b/treesit-fold.el
@@ -630,13 +630,13 @@ then return the last iterated node.
Argument NEXT is a boolean type. If non-nil iterate forward; otherwise iterate
in backward direction."
(let* ((iter-node node) (last-node node)
- (last-line (treesit-fold--node-start-position node)) line text break
+ (last-line (car (treesit-fold--node-start-point node))) line text
break
(line-range 1) (last-line-range 1) max-line-range
(indentation (treesit-fold--indentation (treesit-node-start
iter-node)))
next-indentation)
(while (and iter-node (not break))
(setq text (string-trim (treesit-node-text iter-node))
- line (treesit-fold--node-start-position iter-node)
+ line (car (treesit-fold--node-start-point iter-node))
line-range (1+ (treesit-fold--count-matches "\n" text))
max-line-range (max line-range last-line-range)
next-indentation (treesit-fold--indentation (treesit-node-start
iter-node)))
