emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor +vterm/toggle and +vterm/here

Browse source
This commit is contained in:
Saúl Germán Gutiérrez Calderón 2021-05-11 17:05:23 -05:00
parent fe9f8e785f
commit 582759e43b
1 changed files with 46 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

32
modules/term/vterm/autoload.el
View file

@ -6,8 +6,9 @@
If prefix ARG is non-nil, recreate vterm buffer in the current project's root." If prefix ARG is non-nil, recreate vterm buffer in the current project's root."
(interactive "P") (interactive "P")
(unless (fboundp 'module-load) (+vterm--configure-project-root-and-display
(user-error "Your build of Emacs lacks dynamic modules support and cannot load vterm")) arg
(lambda()
(let ((buffer-name (let ((buffer-name
(format "*doom:vterm-popup:%s*" (format "*doom:vterm-popup:%s*"
(if (bound-and-true-p persp-mode) (if (bound-and-true-p persp-mode)
@ -29,18 +30,12 @@ If prefix ARG is non-nil, recreate vterm buffer in the current project's root."
(when (bound-and-true-p evil-local-mode) (when (bound-and-true-p evil-local-mode)
(evil-change-to-initial-state)) (evil-change-to-initial-state))
(goto-char (point-max))) (goto-char (point-max)))
(setenv "PROOT" (or (doom-project-root) default-directory))
(let* ((project-root (or (doom-project-root) default-directory))
(default-directory
(if arg
default-directory
project-root)))
(let ((buffer (get-buffer-create buffer-name))) (let ((buffer (get-buffer-create buffer-name)))
(with-current-buffer buffer (with-current-buffer buffer
(unless (eq major-mode 'vterm-mode) (unless (eq major-mode 'vterm-mode)
(vterm-mode)) (vterm-mode))
(+vterm--change-directory-if-remote)) (+vterm--change-directory-if-remote))
(pop-to-buffer buffer)))))) (pop-to-buffer buffer)))))))
;;;###autoload ;;;###autoload
(defun +vterm/here (arg) (defun +vterm/here (arg)
@ -48,20 +43,29 @@ If prefix ARG is non-nil, recreate vterm buffer in the current project's root."
If prefix ARG is non-nil, cd into `default-directory' instead of project root." If prefix ARG is non-nil, cd into `default-directory' instead of project root."
(interactive "P") (interactive "P")
(unless (fboundp 'module-load) (+vterm--configure-project-root-and-display
(user-error "Your build of Emacs lacks dynamic modules support and cannot load vterm")) arg
(lambda()
(require 'vterm) (require 'vterm)
;; This hack forces vterm to redraw, fixing strange artefacting in the tty. ;; This hack forces vterm to redraw, fixing strange artefacting in the tty.
(save-window-excursion (save-window-excursion
(pop-to-buffer "*scratch*")) (pop-to-buffer "*scratch*"))
(let (display-buffer-alist)
(vterm vterm-buffer-name)))))
(defun +vterm--configure-project-root-and-display (arg display-fn)
"Sets the environment variable PROOT and displays a terminal using `display-fn`.
If prefix ARG is non-nil, cd into `default-directory' instead of project root."
(unless (fboundp 'module-load)
(user-error "Your build of Emacs lacks dynamic modules support and cannot load vterm"))
(let* ((project-root (or (doom-project-root) default-directory)) (let* ((project-root (or (doom-project-root) default-directory))
(default-directory (default-directory
(if arg (if arg
default-directory default-directory
project-root)) project-root)))
display-buffer-alist)
(setenv "PROOT" project-root) (setenv "PROOT" project-root)
(vterm vterm-buffer-name) (funcall display-fn)
(+vterm--change-directory-if-remote))) (+vterm--change-directory-if-remote)))
(defun +vterm--change-directory-if-remote () (defun +vterm--change-directory-if-remote ()