Make er/treesit-er-parent-node a global expander

Ignore errors.
adimit · Mar 18, 2023 · a6ac1d0 · a6ac1d0
1 parent 8090469
commit a6ac1d0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 49 deletions.
diff --git a/er-basic-expansions.el b/er-basic-expansions.el
@@ -239,7 +239,8 @@ period and marks next symbol."
                 er/mark-comment
                 er/mark-url
                 er/mark-email
-                er/mark-defun)
+                er/mark-defun
+                er/treesit-er-parent-node)
               er/try-expand-list))
 
 (provide 'er-basic-expansions)

diff --git a/expand-region.el b/expand-region.el
@@ -192,29 +192,6 @@ before calling `er/expand-region' for the first time."
 (eval-after-load 'subword        '(require 'subword-mode-expansions))
 (eval-after-load 'yaml-mode      '(require 'yaml-mode-expansions))
 
-;; Since treesit is behind a compile time flag (for now) we first check if it's available
-(when (and (functionp 'treesit-available-p)
-           (treesit-available-p))
-  ;; treesit expansions can be loaded by any ts mode.
-  (eval-after-load 'c-ts-mode      '(require 'treesit-er-expansions))
-  (eval-after-load 'js-ts-mode     '(require 'treesit-er-expansions))
-  (eval-after-load 'go-ts-mode     '(require 'treesit-er-expansions))
-  (eval-after-load 'css-ts-mode    '(require 'treesit-er-expansions))
-  (eval-after-load 'c++-ts-mode    '(require 'treesit-er-expansions))
-  (eval-after-load 'html-ts-mode   '(require 'treesit-er-expansions))
-  (eval-after-load 'yaml-ts-mode   '(require 'treesit-er-expansions))
-  (eval-after-load 'bash-ts-mode   '(require 'treesit-er-expansions))
-  (eval-after-load 'ruby-ts-mode   '(require 'treesit-er-expansions))
-  (eval-after-load 'java-ts-mode   '(require 'treesit-er-expansions))
-  (eval-after-load 'toml-ts-mode   '(require 'treesit-er-expansions))
-  (eval-after-load 'json-ts-mode   '(require 'treesit-er-expansions))
-  (eval-after-load 'rust-ts-mode   '(require 'treesit-er-expansions))
-  (eval-after-load 'cmake-ts-mode  '(require 'treesit-er-expansions))
-  (eval-after-load 'csharp-ts-mode '(require 'treesit-er-expansions))
-  (eval-after-load 'python-ts-mode '(require 'treesit-er-expansions))
-  (eval-after-load 'go-mod-ts-mode '(require 'treesit-er-expansions))
-  (eval-after-load 'tsx-ts-mode    '(require 'treesit-er-expansions)))
-
 (provide 'expand-region)
 
 ;;; expand-region.el ends here
diff --git a/treesit-er-expansions.el b/treesit-er-expansions.el
@@ -37,6 +37,7 @@
      (treesit-node-at start)
      (lambda (node) (< end (treesit-node-end node))))))
 
+;;;###autoload
 (defun er/treesit-er-parent-node ()
   "Expand to the node above point, or to the node above the active region."
   (interactive)
@@ -48,31 +49,6 @@
     (set-mark (treesit-node-end node))
     (activate-mark)))
 
-(defun er/add-treesit-er-expansion ()
-  "Add the expansion for treesit mode."
-  (set (make-local-variable 'er/try-expand-list)
-       ;; we don't need any other expansion rules once we have treesit
-       '(er/treesit-er-parent-node)))
-
-(er/enable-mode-expansions 'c-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'js-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'go-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'css-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'c++-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'html-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'yaml-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'bash-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'ruby-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'java-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'toml-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'json-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'rust-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'cmake-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'csharp-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'python-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'go-mod-ts-mode 'er/add-treesit-er-expansion)
-(er/enable-mode-expansions 'tsx-ts-mode 'er/add-treesit-er-expansion)
-
 (provide 'treesit-er-expansions)
 
 ;;; treesit-er-expansions.el ends here