WIP: Prototype of treesit.el support for ruby

README.md

@@ -1,3 +1,5 @@
+**This is a WIP port of the original ts-fold library to work with Emacs 29's built in treesit.el. It is not fully tested, and will likely be eventually folded into the original library sometime after the Emacs 29 release**
+
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![JCS-ELPA](https://raw.githubusercontent.com/jcs-emacs/badges/master/elpa/v/ts-fold.svg)](https://jcs-emacs.github.io/jcs-elpa/#/ts-fold)
 

ts-fold-indicators.el

@@ -278,16 +278,16 @@ Argument FOLDED holds folding state; it's a boolean."
   "Refresh indicators for all folding range."
   (when ts-fold-indicators-mode
     (ts-fold--ensure-ts
-      (when-let* ((node (tsc-root-node tree-sitter-tree))
+      (when-let* ((node (treesit-buffer-root-node))
                   (patterns (seq-mapcat (lambda (fold-range) `((,(car fold-range)) @name))
                                         (alist-get major-mode ts-fold-range-alist)
                                         'vector))
                   (query (ignore-errors
-                           (tsc-make-query tree-sitter-language patterns)))
-                  (nodes-to-fold (tsc-query-captures query node #'ignore)))
+                           (treesit-query-compile (treesit-node-language node)
+                                                  (append patterns nil))))
+                  (nodes-to-fold (treesit-query-capture node query nil nil t)))
         (ts-fold-indicators--remove-overlays)
         (thread-last nodes-to-fold
-                     (mapcar #'cdr)
                      (mapc #'ts-fold-indicators--create))))))
 
 (defun ts-fold-indicators--remove-overlays ()

ts-fold-parsers.el

@@ -52,6 +52,7 @@
 (declare-function ts-fold-range-ruby-if "ts-fold.el")
 (declare-function ts-fold-range-rust-macro "ts-fold.el")
 (declare-function ts-fold-range-elixir "ts-fold.el")
+(declare-function ts-fold-range-yaml-object "ts-fold.el")
 
 ;;
 ;; (@* "Parsers" )
@@ -192,7 +193,7 @@
     (compound_statement  . ts-fold-range-seq)
     (comment
      . (lambda (node offset)
-         (if (string-prefix-p "#" (tsc-node-text node))
+         (if (string-prefix-p "#" (treesit-node-text node))
              (ts-fold-range-line-comment node offset "#")
            (ts-fold-range-c-like-comment node offset))))))
 
@@ -258,5 +259,10 @@
   "Rule set for TypeScript."
   (append (ts-fold-parsers-javascript)))
 
+(defun ts-fold-parsers-yaml ()
+  "Rule set for YAML."
+  '((block_mapping_pair . ts-fold-range-yaml-object)))
+
+
 (provide 'ts-fold-parsers)
 ;;; ts-fold-parsers.el ends here

ts-fold-util.el

@@ -46,6 +46,25 @@
         (push ov lst)))
     lst))
 
+;;
+;; (@* "Treesitter")
+;;
+
+(defun ts-fold--get-nth-child (node index)
+  (nth index (treesit-node-children node)))
+
+(defun ts-fold--get-nth-named-child (node index)
+  (nth index (treesit-node-children node t)))
+
+;;
+;; (@* "Folds" )
+;;
+
+(defun ts-fold--get-fold-func (node)
+  (let ((fold-alist (alist-get major-mode ts-fold-range-alist))
+        (node-symbol (intern (treesit-node-type node))))
+  (alist-get node-symbol fold-alist)))
+
 ;;
 ;; (@* "Face" )
 ;;