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

tools/eshell: major refactor & update

Browse source
This commit is contained in:
Henrik Lissner 2018-03-23 18:17:59 -04:00
parent 691c914a15
commit 38a5e73e2e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 69 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

68
modules/tools/eshell/autoload/eshell.el
View file

@ -85,16 +85,13 @@ module to be loaded."
(eshell-life-is-too-much)
(delete-char arg)))
(defun +eshell--outside-prompt-p ()
(< (point) eshell-last-output-end))
(defun +eshell--current-git-branch ()
(let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n")
when (string-match "^\*" match)
collect match))))
(if (not (eq branch nil))
(concat " [" (substring branch 2) "]")
"")))
(let ((branch (car (cl-loop for match in (split-string (shell-command-to-string "git branch") "\n")
if (string-match-p "^\*" match)
collect match))))
(if (not (eq branch nil))
(concat " [" (substring branch 2) "]")
"")))
;;;###autoload
(defun +eshell/split ()
@ -114,56 +111,3 @@ module to be loaded."
(propertize (+eshell--current-git-branch) 'face 'font-lock-function-name-face)
(propertize " λ " 'face 'font-lock-constant-face)))
;;;###autoload
(defun +eshell/evil-append ()
(interactive)
(goto-char eshell-last-output-end)
(call-interactively #'evil-append-line))
;;;###autoload
(defun +eshell/evil-append-maybe ()
(interactive)
(if (+eshell--outside-prompt-p)
(+eshell/evil-append)
(call-interactively #'evil-append)))
;;;###autoload
(defun +eshell/evil-prepend ()
(interactive)
(goto-char eshell-last-output-end)
(call-interactively #'evil-insert))
;;;###autoload
(defun +eshell/evil-prepend-maybe ()
(interactive)
(if (+eshell--outside-prompt-p)
(+eshell/evil-prepend)
(call-interactively #'evil-insert)))
;;;###autoload
(defun +eshell/evil-replace-maybe ()
(interactive)
(if (+eshell--outside-prompt-p)
(user-error "Cannot edit read-only region")
(call-interactively #'evil-replace)))
;;;###autoload
(defun +eshell/evil-replace-state-maybe ()
(interactive)
(if (+eshell--outside-prompt-p)
(user-error "Cannot edit read-only region")
(call-interactively #'evil-replace-state)))
;;;###autoload
(defun +eshell/evil-change ()
(interactive)
(when (+eshell--outside-prompt-p)
(goto-char eshell-last-output-end))
(call-interactively #'evil-change))
;;;###autoload
(defun +eshell/evil-change-line ()
(interactive)
(when (+eshell--outside-prompt-p)
(goto-char eshell-last-output-end))
(call-interactively #'evil-change-line))

39
modules/tools/eshell/autoload/evil.el
View file

@ -9,3 +9,42 @@
(+eshell/open command)
(+eshell/open-popup command)))
;;;###autoload (autoload '+eshell/evil-change "tools/eshell/autoload/evil" nil t)
(evil-define-operator +eshell/evil-change (beg end type register yank-handler delete-func)
"Like `evil-change' but will not delete/copy the prompt."
(interactive "<R><x><y>")
(let ((delete-func (or delete-func #'evil-delete))
(nlines (1+ (evil-count-lines beg end)))
(opoint (save-excursion
(goto-char beg)
(evil-collection-eshell-next-prompt)
(point))))
(unless (eq evil-want-fine-undo t)
(evil-start-undo-step))
(when (get-text-property beg 'read-only)
(save-excursion
(goto-char beg)
(evil-collection-eshell-next-prompt)
(setq beg (point))))
(funcall delete-func beg end type register yank-handler)
(cond
((eq type 'line)
(goto-char eshell-last-output-end)
(when (get-text-property (point) 'read-only)
(evil-collection-eshell-next-prompt))
(evil-append 1))
((eq type 'block) (evil-insert 1 nlines))
(t
(evil-insert 1)))))
;;;###autoload (autoload '+eshell/evil-change-line "tools/eshell/autoload/evil" nil t)
(evil-define-operator +eshell/evil-change-line (beg end type register yank-handler)
"Change to end of line."
:motion evil-end-of-line
(interactive "<R><x><y>")
(when (get-text-property beg 'read-only)
(save-excursion
(goto-char beg)
(evil-collection-eshell-next-prompt)
(setq beg (point))))
(evil-change beg end type register yank-handler #'evil-delete-line))