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

Make buffer library (and ivy switch-buffer commands) workspace-centric, rather than project centric

Browse source
This commit is contained in:
Henrik Lissner 2017-02-21 00:43:15 -05:00
parent 8ded4819e2
commit 5374d96781
2 changed files with 49 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

40
core/autoload/buffers.el
View file

@ -54,22 +54,26 @@ Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/"
;; Buffer Life and Death ;;;;;;;;;;;;;;;
;;;###autoload
(defun doom-buffer-list (&optional all-p)
(defun doom-buffer-list (&optional project-p)
"Get all buffers in the current project, in the current workgroup.
If ALL-P is non-nil, get all buffers across all projects in current
workgroup."
(let ((buffers (cond ((and (featurep 'workgroups2) workgroups-mode)
(wg-workgroup-associated-buffers nil))
((and (featurep 'persp-mode) persp-mode)
(persp-buffer-list-restricted))
(t (buffer-list))))
(project-root (and (not all-p) (doom-project-root t))))
(if project-root
(funcall (if (eq all-p 'not) 'cl-remove-if 'cl-remove-if-not)
(lambda (b) (projectile-project-buffer-p b project-root))
buffers)
buffers)))
If PROJECT-P is non-nil, get all buffers associated with the current project in
the current workspace."
(let* ((buffers (cond ((and (featurep 'workgroups2) workgroups-mode)
(wg-workgroup-associated-buffers nil))
((and (featurep 'persp-mode) persp-mode)
(persp-buffer-list-restricted))
(t (buffer-list))))
(project-root (and project-p (doom-project-root t)))
(buffer-list (if project-root
(funcall (if (eq project-p 'not) 'cl-remove-if 'cl-remove-if-not)
(lambda (b) (projectile-project-buffer-p b project-root))
buffers)
buffers))
(fallback-buffer (doom-fallback-buffer)))
(unless (memq fallback-buffer buffer-list)
(nconc buffer-list (list (doom-fallback-buffer))))
buffer-list))
;;;###autoload
(defun doom-real-buffers-list (&optional buffer-list)
@ -251,7 +255,7 @@ regex PATTERN. Returns the number of killed buffers."
"Kill all buffers in this workspace. If PROJECT-P, kill all buffers that
belong to the current project in this workspace."
(interactive "P")
(let ((buffers (doom-buffer-list (not project-p))))
(let ((buffers (doom-buffer-list project-p)))
(mapc 'doom-kill-buffer-and-windows buffers)
(when (called-interactively-p 'interactive)
(message "Killed %s buffers" (length buffers)))))
@ -261,7 +265,7 @@ belong to the current project in this workspace."
"Kill all other buffers in this workgroup. If PROJECT-P, kill only the other
buffers that belong to the current project."
(interactive "P")
(let ((buffers (doom-buffer-list (not project-p))))
(let ((buffers (doom-buffer-list project-p)))
(mapc (lambda (buf)
(unless (eq buf (current-buffer))
(doom-kill-buffer-and-windows buf)))
@ -274,7 +278,7 @@ buffers that belong to the current project."
"Kill buffers in current workgroup that match regex PATTERN. If BANG, then
exclude buffers that aren't part of the current project."
(interactive "sP")
(let* ((buffers (doom-buffer-list (not project-p)))
(let* ((buffers (doom-buffer-list project-p))
(n (doom-kill-matching-buffers pattern buffers)))
(when (called-interactively-p 'interactive)
(message "Killed %s buffers" n))))
@ -283,7 +287,7 @@ exclude buffers that aren't part of the current project."
(defun doom/cleanup-buffers ()
"Clean up buried, unreal buffers."
(interactive)
(let ((buffers (doom-buried-buffers (doom-buffer-list t))))
(let ((buffers (doom-buried-buffers (doom-buffer-list))))
(mapc 'doom-kill-buffer buffers)
(setq n (+ (doom-kill-process-buffers) (length buffers)))
(when (called-interactively-p 'interactive)

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

@ -1,7 +1,7 @@
;;; completion/ivy/autoload/ivy.el
;; Show more information in ivy-switch-buffer; and only display
;; project/workgroup-relevant buffers.
;; workgroup-relevant buffers.
(defun +ivy--get-buffers (&optional buffer-list)
(let ((min-name 5)
(min-mode 5)
@ -19,21 +19,20 @@
(setq min-name (+ (length buffer-name) 15)))
(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-comment-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 'doom-modeline-buffer-modified)))
(propertize mode-name 'face 'font-lock-constant-face)
(when buffer-file-name
(abbreviate-file-name (file-name-directory buffer-file-name)))))))
(or buffer-list (doom-buffer-list t))))))
(list (concat
(propertize buffer-name
'face (cond ((string-match-p "^ ?\\*" buffer-name)
'font-lock-comment-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 'doom-modeline-buffer-modified)))
(propertize mode-name 'face 'font-lock-constant-face)
(when buffer-file-name
(abbreviate-file-name (file-name-directory buffer-file-name)))))))
(or buffer-list (doom-buffer-list))))))
(defun +ivy--select-buffer-action (buffer)
(ivy--switch-buffer-action
@ -42,22 +41,22 @@
(substring buffer 0 (s-index-of " " buffer)))))
;;;###autoload
(defun +ivy/switch-project-buffer (&optional all-p)
"Displays open buffers in current project and workspace. If ALL-P, then show
all open buffers."
(defun +ivy/switch-workspace-buffer ()
"Switch to an open buffer in the current workspace."
(interactive)
(ivy-read (format "%s buffers: " (if all-p "All" "Project"))
(+ivy--get-buffers (if all-p (buffer-list)))
(+ivy/switch-buffer t))
;;;###autoload
(defun +ivy/switch-buffer (&optional workspace-only-p)
"Switch to an open buffer in the global buffer list. If WORKSPACE-ONLY-P,
limit to buffers in the current workspace."
(interactive)
(ivy-read (format "%s buffers: " (if workspace-only-p "Workspace" "Global"))
(+ivy--get-buffers (unless workspace-only-p (buffer-list)))
:matcher #'ivy--switch-buffer-matcher
:action #'+ivy--select-buffer-action
:keymap ivy-switch-buffer-map
:caller '+ivy/switch-project-buffer))
;;;###autoload
(defun +ivy/switch-buffer ()
"Displays all open buffers, across projects and workspaces."
(interactive)
(+ivy/switch-project-buffer t))
:caller '+ivy/switch-workspace-buffer))
;;;###autoload
(defun +ivy/kill-ring ()