maciej/counsel-projectile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cp-ag/rg: Handle case where counsel base command is a list

Browse source 
In particular the default value of `counsel-rg-base-command` was
recently changed from a string to a list.

Fixes #154
This commit is contained in:
Eric Danan 2020-05-20 15:22:56 +01:00
parent 126e825bba
commit 1d0b7d22d7
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
counsel-projectile.el
View file

@ -797,9 +797,8 @@ is called with a prefix argument."
(projectile-ignored-files-rel) (projectile-ignored-files-rel)
(projectile-ignored-directories-rel)) (projectile-ignored-directories-rel))
" ")) " "))
(counsel-ag-base-command (counsel-ag-command counsel-ag-base-command)
(format counsel-ag-base-command (counsel-ag-base-command (counsel--format-ag-command ignored "%s")))
(concat ignored " %s"))))
(ivy-add-actions (ivy-add-actions
'counsel-ag 'counsel-ag
counsel-projectile-ag-extra-actions) counsel-projectile-ag-extra-actions)
@ -807,7 +806,10 @@ is called with a prefix argument."
(projectile-project-root) (projectile-project-root)
options options
(projectile-prepend-project-name (projectile-prepend-project-name
(concat (car (split-string counsel-ag-base-command)) ": ")))))) (concat (car (if (listp counsel-ag-base-command)
counsel-ag-base-command
(split-string counsel-ag-base-command)))
": "))))))
;;* counsel-projectile-rg ;;* counsel-projectile-rg
@ -863,9 +865,8 @@ is called with a prefix argument."
(projectile-ignored-files-rel) (projectile-ignored-files-rel)
(projectile-ignored-directories-rel)) (projectile-ignored-directories-rel))
" ")) " "))
(counsel-rg-base-command (counsel-ag-command counsel-rg-base-command)
(format counsel-rg-base-command (counsel-rg-base-command (counsel--format-ag-command ignored "%s")))
(concat ignored " %s"))))
(ivy-add-actions (ivy-add-actions
'counsel-rg 'counsel-rg
counsel-projectile-rg-extra-actions) counsel-projectile-rg-extra-actions)
@ -873,7 +874,10 @@ is called with a prefix argument."
(projectile-project-root) (projectile-project-root)
options options
(projectile-prepend-project-name (projectile-prepend-project-name
(concat (car (split-string counsel-rg-base-command)) ": ")))))) (concat (car (if (listp counsel-rg-base-command)
counsel-rg-base-command
(split-string counsel-rg-base-command)))
": "))))))
;;* counsel-projectile-org-capture ;;* counsel-projectile-org-capture