322528ca8d
Delete the hook that commit9fcf8c898dadded to persp-created-functions, and change spacemacs/ivy-spacemacs-layouts, spacemacs/helm-perspectives, spacemacs/helm-persp-switch-project, and spacemacs/ivy-persp-switch-project to achieve the intended goal of adding the desired buffers after creating a new perspective. Change spacemacs/helm-persp-switch-project and spacemacs/ivy-persp-switch-project as follows: If the user selects a project but then quits without selecting a file or buffer, the new perspective is now immediately killed. Otherwise, if the perspective did not already exist, any buffers that belong to the selected project are added to the perspective. Add the following actions to spacemacs/ivy-spacemacs-layouts and spacemacs/helm-perspectives: * Create a new perspective with the Spacemacs home buffer (default action). * Create a new perspective with the buffers that belong to the current buffer's project. * Create a new perspective with the buffers that belong to the current perspective (i.e., make a copy of the current perspective). This commit resolves the problem reported in9fcf8c898d (commitcomment-33343455). This commit also fixes a problem with the default action for spacemacs/ivy-spacemacs-layouts and spacemacs/helm-perspectives. According to commit7b931a9f5b, the default action is supposed to display the home buffer if the action creates a new perspective, which was determined by checking whether the perspective was missing from the list of perspectives _before_ switching. However, commiteb7ca651fechanged this logic so it was checking whether the perspective was missing from the list of perspectives _after_ switching. This commit restores the correct logic. * CHANGELOG.develop: Update. * layers/+completion/ivy/funcs.el (spacemacs/ivy-spacemacs-layouts): Add "Copy Current Layout" and "Create Project Layout" actions to the docstring. Use spacemacs//create-persp-with-home-buffer for the default action. * layers/+completion/ivy/packages.el (ivy/post-init-persp-mode): Add actions for spacemacs//create-persp-with-current-project-buffers and persp-copy. * layers/+spacemacs/spacemacs-layouts/funcs.el (spacemacs||switch-layout): New macro. Switch to the named perspective, and initialize it using the provided forms if the perspective is new. (spacemacs//create-persp-with-current-project-buffers): New function. Create a new perspective with the current project's buffers. (spacemacs||switch-project-persp): New macro. Switch to the named perspective, and evaluate the provided forms with projectile-after-switch-project-hook bound with a hook that adds the current project's buffers to the perspective. If the user quits during the evaluation of the forms, kill the perspective. (spacemacs//create-persp-with-home-buffer): New function. Switch to the named perspective, and go to the Spacemacs home buffer if the perspective is new. (spacemacs/helm-perspectives): Use spacemacs//create-persp-with-home-buffer for the default action. Add actions for spacemacs//create-persp-with-current-project-buffers and persp-copy. (spacemacs//helm-persp-switch-project-action): New function. Switch to the named perspective and call projectile-switch-project-by-name, using the new spacemacs||switch-project-persp macro. Bind helm-quit-hook with a hook that kills the new perspective if the user quits projectile-switch-project-by-name. (spacemacs/helm-persp-switch-project): Use spacemacs//helm-persp-switch-project-action. (spacemacs//ivy-persp-switch-project-action): New function. Switch to the named perspective and call counsel-projectile-switch-project-action with a hook to add the project's buffers to the new perspective. (spacemacs/ivy-persp-switch-project): Delete advice for counsel-projectile-switch-project-action. Use spacemacs//ivy-persp-switch-project-action instead. (spacemacs//add-project-buffers-to-persp): Deleted. * layers/+spacemacs/spacemacs-layouts/packages.el (spacemacs-layouts/init-persp-mode): Don't add a hook to persp-created-functions.
359 lines
12 KiB
EmacsLisp
359 lines
12 KiB
EmacsLisp
;;; packages.el --- Ivy Layer packages File
|
|
;;
|
|
;; Copyright (c) 2012-2018 Sylvain Benner & Contributors
|
|
;;
|
|
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
|
|
;; URL: https://github.com/syl20bnr/spacemacs
|
|
;;
|
|
;; This file is not part of GNU Emacs.
|
|
;;
|
|
;;; License: GPLv3
|
|
|
|
(setq ivy-packages
|
|
'(
|
|
auto-highlight-symbol
|
|
bookmark
|
|
counsel
|
|
counsel-projectile
|
|
evil
|
|
flx
|
|
helm-make
|
|
imenu
|
|
ivy
|
|
ivy-hydra
|
|
(ivy-rich :toggle ivy-enable-advanced-buffer-information)
|
|
(ivy-spacemacs-help :location local)
|
|
ivy-xref
|
|
org
|
|
persp-mode
|
|
projectile
|
|
recentf
|
|
smex
|
|
swiper
|
|
wgrep
|
|
))
|
|
|
|
(defun ivy/pre-init-auto-highlight-symbol ()
|
|
(spacemacs|use-package-add-hook auto-highlight-symbol
|
|
:post-init
|
|
;; add some functions to ahs transient states
|
|
(setq spacemacs--symbol-highlight-transient-state-doc
|
|
(concat
|
|
spacemacs--symbol-highlight-transient-state-doc
|
|
" Search: [_s_] swiper [_b_] buffers [_f_] files [_/_] project"))
|
|
(spacemacs/transient-state-register-add-bindings 'symbol-highlight
|
|
'(("s" spacemacs/swiper-region-or-symbol :exit t)
|
|
("b" spacemacs/swiper-all-region-or-symbol :exit t)
|
|
("f" spacemacs/search-auto-region-or-symbol :exit t)
|
|
("/" spacemacs/search-project-auto-region-or-symbol :exit t)))))
|
|
|
|
(defun ivy/post-init-bookmark ()
|
|
(spacemacs/set-leader-keys "fb" 'counsel-bookmark))
|
|
|
|
(defun ivy/init-counsel ()
|
|
(use-package counsel
|
|
:init
|
|
(progn
|
|
(spacemacs/set-leader-keys
|
|
dotspacemacs-emacs-command-key 'counsel-M-x
|
|
;; files
|
|
"ff" 'counsel-find-file
|
|
"fel" 'counsel-find-library
|
|
"fL" 'counsel-locate
|
|
;; help
|
|
"?" 'counsel-descbinds
|
|
"hda" 'counsel-apropos
|
|
"hdf" 'counsel-describe-function
|
|
"hdF" 'counsel-describe-face
|
|
"hdm" 'spacemacs/describe-mode
|
|
"hdv" 'counsel-describe-variable
|
|
"hi" 'counsel-info-lookup-symbol
|
|
"hR" 'spacemacs/counsel-search-docs
|
|
;; insert
|
|
"iu" 'counsel-unicode-char
|
|
;; jump
|
|
;; register/ring
|
|
"ry" 'counsel-yank-pop
|
|
"rm" 'counsel-mark-ring
|
|
;; jumping
|
|
"sj" 'spacemacs/counsel-jump-in-buffer
|
|
;; themes
|
|
"Ts" 'counsel-load-theme
|
|
;; search
|
|
"/" 'spacemacs/search-project-auto
|
|
"*" 'spacemacs/search-project-auto-region-or-symbol
|
|
"sd" 'spacemacs/search-dir-auto
|
|
"sD" 'spacemacs/search-dir-auto-region-or-symbol
|
|
"sf" 'spacemacs/search-auto
|
|
"sF" 'spacemacs/search-auto-region-or-symbol
|
|
"sp" 'spacemacs/search-project-auto
|
|
"sP" 'spacemacs/search-project-auto-region-or-symbol
|
|
"sad" 'spacemacs/search-dir-ag
|
|
"saD" 'spacemacs/search-dir-ag-region-or-symbol
|
|
"saf" 'spacemacs/search-ag
|
|
"saF" 'spacemacs/search-ag-region-or-symbol
|
|
"sap" 'spacemacs/search-project-ag
|
|
"saP" 'spacemacs/search-project-ag-region-or-symbol
|
|
"sgd" 'spacemacs/search-dir-grep
|
|
"sgD" 'spacemacs/search-dir-grep-region-or-symbol
|
|
"sgf" 'spacemacs/search-grep
|
|
"sgF" 'spacemacs/search-grep-region-or-symbol
|
|
"sgp" 'counsel-git-grep
|
|
"sgP" 'spacemacs/counsel-git-grep-region-or-symbol
|
|
"skd" 'spacemacs/search-dir-ack
|
|
"skD" 'spacemacs/search-dir-ack-region-or-symbol
|
|
"skf" 'spacemacs/search-ack
|
|
"skF" 'spacemacs/search-ack-region-or-symbol
|
|
"skp" 'spacemacs/search-project-ack
|
|
"skP" 'spacemacs/search-project-ack-region-or-symbol
|
|
"srd" 'spacemacs/search-dir-rg
|
|
"srD" 'spacemacs/search-dir-rg-region-or-symbol
|
|
"srf" 'spacemacs/search-rg
|
|
"srF" 'spacemacs/search-rg-region-or-symbol
|
|
"srp" 'spacemacs/search-project-rg
|
|
"srP" 'spacemacs/search-project-rg-region-or-symbol
|
|
"std" 'spacemacs/search-dir-pt
|
|
"stD" 'spacemacs/search-dir-pt-region-or-symbol
|
|
"stf" 'spacemacs/search-pt
|
|
"stF" 'spacemacs/search-pt-region-or-symbol
|
|
"stp" 'spacemacs/search-project-pt
|
|
"stP" 'spacemacs/search-project-pt-region-or-symbol))
|
|
:config
|
|
(progn
|
|
;; Temporarily handle older versions of ivy
|
|
;; https://github.com/abo-abo/swiper/pull/1863/files
|
|
(unless (fboundp 'counsel--elisp-to-pcre)
|
|
(defalias 'counsel--elisp-to-pcre 'counsel-unquote-regex-parens))
|
|
|
|
;; set additional ivy actions
|
|
(ivy-set-actions
|
|
'counsel-find-file
|
|
spacemacs--ivy-file-actions)
|
|
|
|
(define-key counsel-find-file-map (kbd "C-h") 'counsel-up-directory)
|
|
(define-key read-expression-map (kbd "C-r") 'counsel-minibuffer-history)
|
|
;; remaps built-in commands that have a counsel replacement
|
|
(counsel-mode 1)
|
|
(spacemacs|hide-lighter counsel-mode)
|
|
;; TODO Commands to port
|
|
(spacemacs//ivy-command-not-implemented-yet "jI")
|
|
;; Set syntax highlighting for counsel search results
|
|
(ivy-set-display-transformer 'spacemacs/counsel-search 'counsel-git-grep-transformer))))
|
|
|
|
(defun ivy/pre-init-counsel-projectile ()
|
|
;; overwrite projectile settings
|
|
(spacemacs|use-package-add-hook projectile
|
|
:post-init
|
|
(progn
|
|
(setq projectile-switch-project-action 'counsel-projectile-find-file)
|
|
|
|
(ivy-set-actions
|
|
'counsel-projectile-find-file
|
|
(append spacemacs--ivy-file-actions
|
|
'(("R" (lambda (arg)
|
|
(interactive)
|
|
(call-interactively
|
|
#'projectile-invalidate-cache)
|
|
(ivy-resume)) "refresh list")
|
|
)))
|
|
|
|
(spacemacs/set-leader-keys
|
|
"p SPC" 'counsel-projectile
|
|
"pb" 'counsel-projectile-switch-to-buffer
|
|
"pd" 'counsel-projectile-find-dir
|
|
"pp" 'counsel-projectile-switch-project
|
|
"pf" 'counsel-projectile-find-file))))
|
|
|
|
(defun ivy/post-init-evil ()
|
|
(spacemacs/set-leader-keys
|
|
"re" 'spacemacs/ivy-evil-registers))
|
|
|
|
(defun ivy/init-flx ()
|
|
(use-package flx))
|
|
|
|
(defun ivy/init-helm-make ()
|
|
(use-package helm-make
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(setq helm-make-completion-method 'ivy)
|
|
(spacemacs/set-leader-keys
|
|
"cc" 'helm-make-projectile
|
|
"cm" 'helm-make))))
|
|
|
|
(defun ivy/post-init-imenu ()
|
|
(spacemacs/set-leader-keys "ji" 'spacemacs/counsel-jump-in-buffer))
|
|
|
|
(defun ivy/init-ivy ()
|
|
(use-package ivy
|
|
:init
|
|
(progn
|
|
;; Key bindings
|
|
(spacemacs/set-leader-keys
|
|
"a'" 'spacemacs/ivy-available-repls
|
|
"fr" 'counsel-recentf
|
|
"rl" 'ivy-resume
|
|
"bb" 'ivy-switch-buffer))
|
|
|
|
:config
|
|
(progn
|
|
;; custom actions for recentf
|
|
(ivy-set-actions
|
|
'counsel-recentf
|
|
spacemacs--ivy-file-actions)
|
|
|
|
;; add spacemacs/counsel-search command to ivy-highlight-grep-commands
|
|
(add-to-list 'ivy-highlight-grep-commands 'spacemacs/counsel-search)
|
|
|
|
;; mappings to quit minibuffer or enter transient state
|
|
(define-key ivy-minibuffer-map [escape] 'minibuffer-keyboard-quit)
|
|
(define-key ivy-minibuffer-map (kbd "M-SPC") 'hydra-ivy/body)
|
|
|
|
(ivy-mode 1)
|
|
(global-set-key (kbd "C-c C-r") 'ivy-resume)
|
|
(global-set-key (kbd "<f6>") 'ivy-resume)
|
|
;; Occur
|
|
(evil-set-initial-state 'ivy-occur-grep-mode 'normal)
|
|
(evil-make-overriding-map ivy-occur-mode-map 'normal)
|
|
(ivy-set-occur 'spacemacs/counsel-search
|
|
'spacemacs//counsel-occur)
|
|
(spacemacs/set-leader-keys-for-major-mode 'ivy-occur-grep-mode
|
|
"w" 'spacemacs/ivy-wgrep-change-to-wgrep-mode
|
|
"s" 'wgrep-save-all-buffers)
|
|
;; Why do we do this ?
|
|
(ido-mode -1)
|
|
|
|
;; allow to select prompt in some ivy functions
|
|
(setq ivy-use-selectable-prompt t))))
|
|
|
|
(defun ivy/init-ivy-hydra ()
|
|
(use-package ivy-hydra)
|
|
(define-key hydra-ivy/keymap [escape] 'hydra-ivy/keyboard-escape-quit-and-exit))
|
|
|
|
(defun ivy/init-ivy-rich ()
|
|
(use-package ivy-rich
|
|
;; if `counsel' loads after `ivy-rich', it overrides some of `ivy-rich''s
|
|
;; transformers
|
|
:after counsel
|
|
:init
|
|
(progn
|
|
(setq ivy-rich-path-style 'abbrev
|
|
ivy-virtual-abbreviate 'full))
|
|
:config
|
|
(progn
|
|
(ivy-rich-mode))))
|
|
|
|
(defun ivy/init-ivy-spacemacs-help ()
|
|
(use-package ivy-spacemacs-help
|
|
:commands (ivy-spacemacs-help-dotspacemacs
|
|
ivy-spacemacs-help
|
|
ivy-spacemacs-help-faq
|
|
ivy-spacemacs-help-layers
|
|
ivy-spacemacs-help-packages
|
|
ivy-spacemacs-help-docs
|
|
ivy-spacemacs-help-toggles)
|
|
:init (spacemacs/set-leader-keys
|
|
"h ." 'ivy-spacemacs-help-dotspacemacs
|
|
"h SPC" 'ivy-spacemacs-help
|
|
"h f" 'ivy-spacemacs-help-faq
|
|
"h l" 'ivy-spacemacs-help-layers
|
|
"h p" 'ivy-spacemacs-help-packages
|
|
"h r" 'ivy-spacemacs-help-docs
|
|
"h t" 'ivy-spacemacs-help-toggles)))
|
|
|
|
(defun ivy/init-ivy-xref ()
|
|
(use-package ivy-xref
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(setq xref-prompt-for-identifier '(not xref-find-definitions
|
|
xref-find-definitions-other-window
|
|
xref-find-definitions-other-frame
|
|
xref-find-references
|
|
spacemacs/jump-to-definition))
|
|
|
|
;; Use ivy-xref to display `xref.el' results.
|
|
(setq xref-show-xrefs-function #'ivy-xref-show-xrefs))))
|
|
|
|
(defun ivy/post-init-org ()
|
|
(add-hook 'org-ctrl-c-ctrl-c-hook 'spacemacs//counsel-org-ctrl-c-ctrl-c-org-tag))
|
|
|
|
(defun ivy/pre-init-persp-mode ()
|
|
(spacemacs|use-package-add-hook persp-mode
|
|
:post-config
|
|
(setq
|
|
spacemacs--persp-display-buffers-func 'spacemacs/ivy-spacemacs-layout-buffer
|
|
spacemacs--persp-display-perspectives-func 'spacemacs/ivy-spacemacs-layouts)))
|
|
|
|
(defun ivy/post-init-persp-mode ()
|
|
;; based on https://gist.github.com/Bad-ptr/1aca1ec54c3bdb2ee80996eb2b68ad2d#file-persp-ivy-el
|
|
(add-hook 'ivy-ignore-buffers #'spacemacs//layout-not-contains-buffer-p)
|
|
(setq ivy-sort-functions-alist
|
|
(append ivy-sort-functions-alist
|
|
'((persp-kill-buffer . nil)
|
|
(persp-remove-buffer . nil)
|
|
(persp-add-buffer . nil)
|
|
(persp-switch . nil)
|
|
(persp-window-switch . nil)
|
|
(persp-frame-switch . nil))))
|
|
|
|
(ivy-set-actions
|
|
'spacemacs/ivy-spacemacs-layouts
|
|
'(("c" persp-kill-without-buffers "Close layout(s)")
|
|
("k" persp-kill "Kill layout(s)")
|
|
("n" persp-copy "Copy Current Layout")
|
|
("p" spacemacs//create-persp-with-current-project-buffers
|
|
"Create Project Layout")))
|
|
;; TODO: better handling of C and X bindings for ivy
|
|
;; check ivy/pre-init-persp-mode
|
|
(spacemacs/transient-state-register-remove-bindings 'layouts
|
|
'("C" "X"))
|
|
(spacemacs/transient-state-register-add-bindings 'layouts
|
|
'(("C" spacemacs/ivy-spacemacs-layout-close-other :exit t)
|
|
("X" spacemacs/ivy-spacemacs-layout-kill-other :exit t))))
|
|
|
|
(defun ivy/post-init-projectile ()
|
|
(setq projectile-completion-system 'ivy)
|
|
(spacemacs/set-leader-keys
|
|
"pv" 'projectile-vc))
|
|
|
|
(defun ivy/post-init-recentf ()
|
|
;; custom actions for recentf
|
|
(ivy-set-actions
|
|
'counsel-recentf
|
|
(append spacemacs--ivy-file-actions
|
|
'(("R" (lambda (arg)
|
|
(interactive)
|
|
(recentf-cleanup)
|
|
(ivy-recentf)) "refresh list")
|
|
("D" (lambda (arg)
|
|
(interactive)
|
|
(setq recentf-list (delete arg recentf-list))
|
|
(ivy-recentf)) "delete from list"))))
|
|
;; merge recentf and bookmarks into buffer switching. If we set this
|
|
(setq ivy-use-virtual-buffers t))
|
|
|
|
(defun ivy/init-smex ()
|
|
(use-package smex
|
|
:defer t
|
|
:init (setq-default smex-history-length 32
|
|
smex-save-file (concat spacemacs-cache-directory
|
|
".smex-items"))))
|
|
|
|
(defun ivy/init-swiper ()
|
|
(use-package swiper
|
|
:config
|
|
(progn
|
|
(spacemacs/set-leader-keys
|
|
"ss" 'swiper
|
|
"sS" 'spacemacs/swiper-region-or-symbol
|
|
"sb" 'swiper-all
|
|
"sB" 'spacemacs/swiper-all-region-or-symbol)
|
|
(global-set-key "\C-s" 'swiper))))
|
|
|
|
(defun ivy/init-wgrep ()
|
|
(evil-define-key 'normal wgrep-mode-map ",," 'wgrep-finish-edit)
|
|
(evil-define-key 'normal wgrep-mode-map ",c" 'wgrep-finish-edit)
|
|
(evil-define-key 'normal wgrep-mode-map ",a" 'wgrep-abort-changes)
|
|
(evil-define-key 'normal wgrep-mode-map ",k" 'wgrep-abort-changes))
|