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

Refactor counsel-find-file actions

Browse source 
Conform them to naming conventions & only autoload the functions that
aren't used immediately.
This commit is contained in:
Henrik Lissner 2018-07-05 14:05:09 +02:00
parent cd26e11e94
commit 2d30d996c3
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/completion/ivy/autoload/ivy.el
View file

@ -197,21 +197,9 @@ search current file. See `+ivy-task-tags' to customize what this searches for."
(run-hooks 'counsel-grep-post-action-hook)
(selected-window))))))
;;;###autoload
(defun +ivy/reloading (cmd)
(lambda (x)
(funcall cmd x)
(ivy--reset-state ivy-last)))
;;;###autoload
(defun +ivy/given-file (cmd prompt)
(lambda (source)
(let ((target
(let ((enable-recursive-minibuffers t))
(read-file-name
(format "%s %s to:" prompt source)))))
(funcall cmd source target 1))))
(defun +ivy-confirm-delete-file (x)
(dired-delete-file x 'confirm-each-subdirectory))
;;

18
modules/completion/ivy/config.el
View file

@ -98,16 +98,28 @@ immediately runs it on the current candidate (ending the ivy session)."
;; Dim recentf entries that are not in the current project.
(ivy-set-display-transformer #'counsel-recentf #'+ivy-recentf-transformer)
;; Factories
(defun +ivy-action-reloading (cmd)
(lambda (x)
(funcall cmd x)
(ivy--reset-state ivy-last)))
(defun +ivy-action-given-file (cmd prompt)
(lambda (source)
(let* ((enable-recursive-minibuffers t)
(target (read-file-name (format "%s %s to:" prompt source))))
(funcall cmd source target 1))))
;; Configure `counsel-find-file'
(ivy-add-actions
'counsel-find-file
`(("b" counsel-find-file-cd-bookmark-action "cd bookmark")
("s" counsel-find-file-as-root "open as root")
("m" counsel-find-file-mkdir-action "mkdir")
("c" ,(+ivy/given-file #'copy-file "Copy file") "copy file")
("d" ,(+ivy/reloading #'+ivy/confirm-delete-file) "delete")
("c" ,(+ivy-action-given-file #'copy-file "Copy file") "copy file")
("d" ,(+ivy-action-reloading #'+ivy-confirm-delete-file) "delete")
("r" (lambda (path) (rename-file path (read-string "New name: "))) "rename")
("R" ,(+ivy/reloading (+ivy/given-file #'rename-file "Move")) "move")
("R" ,(+ivy-action-reloading (+ivy-action-given-file #'rename-file "Move")) "move")
("f" find-file-other-window "other window")
("F" find-file-other-frame "other frame")
("p" (lambda (path) (with-ivy-window (insert (file-relative-name path default-directory)))) "insert relative path")