ref

Author: jcs090218

foldvis-origami.el

@@ -77,20 +77,19 @@ Arguments WEND and WSTART are the range for caching."
 ;;;###autoload
 (defun foldvis-origami--refresh (&rest _)
   "Refresh indicators for all folding range."
-  (origami-util-with-current-buffer buffer
-    (when-let*
-        ((tree (ignore-errors (origami-get-fold-tree buffer)))
-         (nodes-to-fold (elt tree 4))
-         (wend   (window-end nil t))
-         (wstart (window-start))
-         (nodes-to-fold
-          (cl-remove-if-not (lambda (node)
-                              (foldvis-origami--within-window node wend wstart))
-                            nodes-to-fold)))
-      (foldvis--remove-ovs)
-      (thread-last nodes-to-fold
-                   (mapc #'foldvis-origami--create))
-      (run-hooks 'foldvis-refresh-hook))))
+  (when-let*
+      ((tree (ignore-errors (origami-get-fold-tree (current-buffer))))
+       (nodes-to-fold (elt tree 4))
+       (wend   (window-end nil t))
+       (wstart (window-start))
+       (nodes-to-fold
+        (cl-remove-if-not (lambda (node)
+                            (foldvis-origami--within-window node wend wstart))
+                          nodes-to-fold)))
+    (foldvis--remove-ovs)
+    (thread-last nodes-to-fold
+                 (mapc #'foldvis-origami--create))
+    (run-hooks 'foldvis-refresh-hook)))
 
 (provide 'foldvis-origami)
 ;;; foldvis-origami.el ends here

foldvis-treesit-fold.el

@@ -35,12 +35,12 @@
 ;;;###autoload
 (defun foldvis-treesit-fold--enable ()
   "Enable the folding minor mode."
-  (advice-add 'treesit-fold--after-command :after #'foldvis-treesit-fold--refresh))
+  (advice-add 'treesit-fold--after-command :after #'foldvis-refresh))
 
 ;;;###autoload
 (defun foldvis-treesit-fold--disable ()
   "Disable the folding minor mode."
-  (advice-remove 'treesit-fold--after-command #'foldvis-treesit-fold--refresh))
+  (advice-remove 'treesit-fold--after-command #'foldvis-refresh))
 
 ;;;###autoload
 (defun foldvis-treesit-fold--valid ()

foldvis-ts-fold.el

@@ -36,13 +36,13 @@
 (defun foldvis-ts-fold--enable ()
   "Enable the folding minor mode."
   (add-hook 'tree-sitter-after-change-functions #'foldvis--trigger-render nil t)
-  (advice-add 'ts-fold--after-command :after #'foldvis-ts-fold--refresh))
+  (advice-add 'ts-fold--after-command :after #'foldvis-refresh))
 
 ;;;###autoload
 (defun foldvis-ts-fold--disable ()
   "Disable the folding minor mode."
   (remove-hook 'tree-sitter-after-change-functions #'foldvis--trigger-render t)
-  (advice-remove 'ts-fold--after-command #'foldvis-ts-fold--refresh))
+  (advice-remove 'ts-fold--after-command #'foldvis-refresh))
 
 ;;;###autoload
 (defun foldvis-ts-fold--valid ()

foldvis.el

@@ -167,27 +167,31 @@ See macro `with-selected-window' description for arguments WINDOW and BODY."
 
 (defun foldvis--choose-backend ()
   "Set the current possible backend."
-  (let ((backend (cl-some (lambda (x)
-                            (when (foldvis--call-backend "-valid" x)
-                              x))
-                          foldvis-backends)))
-    (when (and foldvis--backend
-               (not (equal foldvis--backend backend)))  ; has changed?
-      ;; TODO: ..
-      )
-    (setq foldvis--backend backend)))
+  (let* ((backend (cl-some (lambda (x)
+                             (when (foldvis--call-backend "-valid" x)
+                               x))
+                           foldvis-backends))
+         (changed (and foldvis--backend backend
+                       (not (equal foldvis--backend backend)))))
+    (setq foldvis--backend backend)
+    ;; If backend has changed, re-render once.
+    (when changed
+      (foldvis--render-buffer))
+    ;; If backend has become nil, remove it.
+    (unless backend
+      (foldvis--remove-ovs-buffer))))
 
 (defun foldvis--enable ()
   "Start folding minor mode."
   (foldvis--call-backend "-enable")
   (add-hook 'after-save-hook #'foldvis--trigger-render nil t)
   (add-hook 'post-command-hook #'foldvis--post-command nil t)
   (add-hook 'window-size-change-functions #'foldvis--size-change)
-  (add-hook 'window-scroll-functions #'foldvis--scroll)
-  (foldvis--render-buffer))
+  (add-hook 'window-scroll-functions #'foldvis--scroll))
 
 (defun foldvis--disable ()
   "Stop folding minor mode."
+  (setq foldvis--backend nil)
   (foldvis--call-backend "-disable")
   (remove-hook 'after-save-hook #'foldvis--trigger-render t)
   (remove-hook 'post-command-hook #'foldvis--post-command t)
@@ -201,11 +205,7 @@ See macro `with-selected-window' description for arguments WINDOW and BODY."
   :group 'foldvis
   :init-value nil
   :lighter " FoldVis"
-  (foldvis--choose-backend)
-  (cond (foldvis--backend
-         (if foldvis-mode (foldvis--enable) (foldvis--disable)))
-        (t (message "No folding backend found: %s" foldvis--backend)
-           (foldvis-mode -1))))
+  (if foldvis-mode (foldvis--enable) (foldvis--disable)))
 
 (defun foldvis--turn-on-foldvis-mode ()
   "Turn on the `foldvis-mode'."
@@ -380,6 +380,7 @@ Argument FOLDED holds folding state; it's a boolean."
 
 (defun foldvis--post-command ()
   "Post command."
+  (foldvis--choose-backend)
   (when foldvis--render-this-command-p
     (foldvis-refresh)
     (setq foldvis--render-this-command-p nil)))