all repos — nixfiles @ 15529c6ca8c3480a0d891148efc4dbbe60729503

System and user configuration, managed by nix and home-manager

Emacs: fix tree-sitter-based evil commands
Alan Pearce alan@alanpearce.eu
Sun, 11 Jun 2023 08:43:40 +0200
commit

15529c6ca8c3480a0d891148efc4dbbe60729503

parent

3a52fcd76fe2313e041a6d3b45913dc2a6159779

1 files changed, 20 insertions(+), 18 deletions(-)

jump to
M user/emacs/init.eluser/emacs/init.el
@@ -455,27 +455,29 @@ (add-hook 'org-agenda-mode-hook #'evil-org-agenda-set-keys))   :ghook ('org-mode-hook #'evil-org-mode)
   :gfhook #'evil-org-set-key-theme)
 
-(defun etts/start-of-next-function ()
-  (interactive)
-  (evil-textobj-tree-sitter-goto-textobj "function.outer" nil nil))
-(defun etts/start-of-prev-function ()
-  (interactive)
-  (evil-textobj-tree-sitter-goto-textobj "function.outer" t nil))
-(defun etts/end-of-next-function ()
-  (interactive)
-  (evil-textobj-tree-sitter-goto-textobj "function.outer" nil t))
-(defun etts/end-of-prev-function ()
-  (interactive)
-  (evil-textobj-tree-sitter-goto-textobj "function.outer" t t))
 (use-package evil-textobj-tree-sitter
   :after evil
+  :defer 5
+  :config (progn
+            (defun etts/start-of-next-function ()
+              (interactive)
+              (evil-textobj-tree-sitter-goto-textobj "function.outer" nil nil))
+            (defun etts/start-of-prev-function ()
+              (interactive)
+              (evil-textobj-tree-sitter-goto-textobj "function.outer" t nil))
+            (defun etts/end-of-next-function ()
+              (interactive)
+              (evil-textobj-tree-sitter-goto-textobj "function.outer" nil t))
+            (defun etts/end-of-prev-function ()
+              (interactive)
+              (evil-textobj-tree-sitter-goto-textobj "function.outer" t t))
+            (general-define-key :keymaps 'evil-outer-text-objects-map
+                                "f" (evil-textobj-tree-sitter-get-textobj "function.outer")
+                                "a" (evil-textobj-tree-sitter-get-textobj ("conditional.outer" "loop.outer")))
+            (general-define-key :keymaps 'evil-inner-text-objects-map
+                                "f" (evil-textobj-tree-sitter-get-textobj "function.inner")
+                                "a" (evil-textobj-tree-sitter-get-textobj ("conditional.inner" "loop.inner"))))
   :general
-  (:keymaps 'evil-outer-text-objects-map
-            "f" (evil-textobj-tree-sitter-get-textobj "function.outer")
-						"a" (evil-textobj-tree-sitter-get-textobj ("conditional.outer" "loop.outer")))
-	(:keymaps 'evil-inner-text-objects-map
-            "f" (evil-textobj-tree-sitter-get-textobj "function.inner")
-            "a" (evil-textobj-tree-sitter-get-textobj ("conditional.inner" "loop.inner")))
   (:states 'normal
            "]f" #'etts/start-of-next-function
            "[f" #'etts/start-of-prev-function