Skip to content

Commit

Permalink
Merge pull request bbatsov#688 from abo-abo/master
Browse files Browse the repository at this point in the history
Add ivy to `projectile-completion-system'
  • Loading branch information
bbatsov committed Mar 16, 2015
2 parents 60d327d + 46ab7fe commit b2d8a4d
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions projectile.el
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ Otherwise consider the current directory the project root."
(const :tag "Ido" ido)
(const :tag "Grizzl" grizzl)
(const :tag "Helm" helm)
(const :tag "Ivy" ivy)
(const :tag "Default" default)
(function :tag "Custom function")))

Expand Down Expand Up @@ -1116,6 +1117,12 @@ https://github.com/emacs-helm/helm")))
(grizzl-completing-read prompt (grizzl-make-index choices))
(user-error "Please install grizzl from \
https://github.com/d11wtq/grizzl")))
((eq projectile-completion-system 'ivy)
(if (fboundp 'ivy-read)
(ivy-read prompt (cl-delete-duplicates choices
:test #'equal) initial-input)
(user-error "Please install ivy from \
https://github.com/abo-abo/swiper")))
(t (funcall projectile-completion-system prompt choices)))))

(defun projectile-current-project-files ()
Expand Down

0 comments on commit b2d8a4d

Please sign in to comment.