branch: elpa/treesit-fold
commit 6f15c1735a51dea1ec1e9d8cdf935d6e708101c2
Author: Jen-Chieh Shen <[email protected]>
Commit: Jen-Chieh Shen <[email protected]>
Support javascript comment
---
tree-sitter-fold-parsers.el | 13 +++++++------
tree-sitter-fold.el | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tree-sitter-fold-parsers.el b/tree-sitter-fold-parsers.el
index 0c1827b84a..1ec145921e 100644
--- a/tree-sitter-fold-parsers.el
+++ b/tree-sitter-fold-parsers.el
@@ -38,7 +38,7 @@
(declare-function tree-sitter-fold-range-seq "tree-sitter-fold.el")
(declare-function tree-sitter-fold-range-line-comment "tree-sitter-fold.el")
(declare-function tree-sitter-fold-range-block-comment "tree-sitter-fold.el")
-(declare-function tree-sitter-fold-c-like-comment "tree-sitter-fold.el")
+(declare-function tree-sitter-fold-range-c-like-comment "tree-sitter-fold.el")
(declare-function tree-sitter-fold-range-c-preproc-ifdef "tree-sitter-fold.el")
(declare-function tree-sitter-fold-range-c-preproc-if "tree-sitter-fold.el")
@@ -70,7 +70,7 @@
(preproc_ifdef . tree-sitter-fold-range-c-preproc-ifdef)
(preproc_elif . tree-sitter-fold-range-c-preproc-elif)
(preproc_else . tree-sitter-fold-range-c-preproc-else)
- (comment . tree-sitter-fold-c-like-comment)))
+ (comment . tree-sitter-fold-range-c-like-comment)))
(defun tree-sitter-fold-parsers-c++ ()
"Rule sets for C++."
@@ -91,7 +91,7 @@
(endif_directive . tree-sitter-fold-range-seq)
(region_directive . tree-sitter-fold-range-seq)
(endregion_directive . tree-sitter-fold-range-seq)
- (comment . tree-sitter-fold-c-like-comment)))
+ (comment .
tree-sitter-fold-range-c-like-comment)))
(defun tree-sitter-fold-parsers-css ()
"Rule sets for CSS."
@@ -126,7 +126,8 @@
(defun tree-sitter-fold-parsers-javascript ()
"Rule sets for JavaScript."
'((export_clause . tree-sitter-fold-range-seq)
- (statement_block . tree-sitter-fold-range-seq)))
+ (statement_block . tree-sitter-fold-range-seq)
+ (comment . tree-sitter-fold-range-c-like-comment)))
(defun tree-sitter-fold-parsers-json ()
"Rule sets for JSON."
@@ -150,7 +151,7 @@
. (lambda (node offset)
(if (string-prefix-p "#" (tsc-node-text node))
(tree-sitter-fold-range-line-comment node offset "#")
- (tree-sitter-fold-c-like-comment node offset))))))
+ (tree-sitter-fold-range-c-like-comment node offset))))))
(defun tree-sitter-fold-parsers-python ()
"Rule sets for Python."
@@ -199,7 +200,7 @@
(class_declaration . tree-sitter-fold-range-seq)
(protocol_declaration . tree-sitter-fold-range-seq)
(extension_declaration . tree-sitter-fold-range-seq)
- (comment . tree-sitter-fold-c-like-comment)))
+ (comment . tree-sitter-fold-range-c-like-comment)))
(defun tree-sitter-fold-parsers-typescript ()
"Rule sets for TypeScript."
diff --git a/tree-sitter-fold.el b/tree-sitter-fold.el
index f406c8e6f9..264c1a6703 100644
--- a/tree-sitter-fold.el
+++ b/tree-sitter-fold.el
@@ -389,7 +389,7 @@ For arguments NODE and OFFSET, see function
`tree-sitter-fold-range-seq' for
more information."
(tree-sitter-fold-range-seq node (tree-sitter-fold-util--cons-add '(1 . -1)
offset)))
-(defun tree-sitter-fold-c-like-comment (node offset)
+(defun tree-sitter-fold-range-c-like-comment (node offset)
"Define fold range for C-like comemnt."
(if (tree-sitter-fold--multi-line node)
(tree-sitter-fold-range-block-comment node offset)