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

Show buffer info on ivy-switch-buffer commands

Browse source
This commit is contained in:
Henrik Lissner 2016-06-13 02:12:59 -04:00
parent d00582ae9c
commit 0a4cf3911c
1 changed files with 54 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

65
core/defuns/defuns-ivy.el
View file

@ -1,17 +1,61 @@
;;; defuns-ivy.el ;;; defuns-ivy.el
;; Show more information in ivy-switch-buffer; and only display
;; project/workgroup-relevant buffers.
(defun doom-ivy-get-buffers (&optional buffer-list)
(let ((min-name 5)
(min-mode 5)
(proot (doom/project-root)))
(mapcar
(lambda (b) (format (format "%%-%ds %%-%ds %%s" min-name min-mode)
(nth 0 b)
(nth 1 b)
(or (nth 2 b) "")))
(mapcar (lambda (b)
(with-current-buffer b
(let ((buffer-name (buffer-name b))
(mode-name (symbol-name major-mode)))
(when (> (length buffer-name) min-name)
(setq min-name (+ (length buffer-name) 10)))
(when (> (length mode-name) min-mode)
(setq min-mode (+ (length mode-name) 3)))
(list
(concat
(propertize buffer-name
'face (cond ((string-match-p "^ ?\\*" buffer-name)
'font-lock-doc-face)
((not (string= proot (doom/project-root)))
'font-lock-keyword-face)
(buffer-read-only
'error)))
(when (and buffer-file-name (buffer-modified-p))
(propertize "[+]" 'face 'mode-line-is-modified)))
(propertize mode-name 'face 'font-lock-constant-face)
(when buffer-file-name
(f-slash (abbreviate-file-name (f-dirname buffer-file-name))))))))
(or buffer-list (doom/get-buffers))))))
(defun doom-ivy-select-buffer-action (buffer)
(ivy--switch-buffer-action
(substring buffer 0 (s-index-of " " buffer))))
;;;###autoload ;;;###autoload
(defun doom/ivy-switch-buffer (&optional all-p) (defun doom/ivy-switch-project-buffer (&optional all-p)
"Displays open buffers in current project. If ALL-P, then show all open "Displays open buffers in current project and workspace. If ALL-P, then show
buffers." all open buffers."
(interactive) (interactive)
(let ((this-command 'ivy-switch-buffer)) (ivy-read (format "%s buffers: " (if all-p "All" "Project"))
(ivy-read "Switch to buffer: " (doom/get-buffer-names (not all-p)) (doom-ivy-get-buffers (if all-p (buffer-list)))
:matcher #'ivy--switch-buffer-matcher :matcher #'ivy--switch-buffer-matcher
:preselect (buffer-name (other-buffer (current-buffer))) :action #'doom-ivy-select-buffer-action
:action #'ivy--switch-buffer-action :keymap ivy-switch-buffer-map
:keymap ivy-switch-buffer-map :caller 'doom/ivy-switch-project-buffer))
:caller 'doom/ivy-switch-buffer)))
;;;###autoload
(defun doom/ivy-switch-buffer ()
"Displays all open buffers, across projects and workspaces."
(interactive)
(doom/ivy-switch-project-buffer t))
;;;###autoload ;;;###autoload
(defun doom/ivy-kill-ring () (defun doom/ivy-kill-ring ()
@ -33,7 +77,6 @@ buffers."
(swiper (or search (thing-at-point 'symbol)))) (swiper (or search (thing-at-point 'symbol))))
(defvar doom-ivy-ag-last-search nil) (defvar doom-ivy-ag-last-search nil)
;;;###autoload (autoload 'doom:ivy-ag-search "defuns-ivy" nil t) ;;;###autoload (autoload 'doom:ivy-ag-search "defuns-ivy" nil t)
(evil-define-operator doom:ivy-ag-search (beg end search regex-p &optional dir) (evil-define-operator doom:ivy-ag-search (beg end search regex-p &optional dir)
"Preform a counsel search with SEARCH. If SEARCH is nil and in visual mode, "Preform a counsel search with SEARCH. If SEARCH is nil and in visual mode,