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

Refactor +helm-file-search & show prompt

Browse source
This commit is contained in:
Henrik Lissner 2018-08-15 23:34:22 +02:00
parent c69543fecc
commit c27ab26fd9
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/completion/helm/autoload/helm.el
View file

@ -138,12 +138,12 @@ order.
(when (> (abs (- end beg)) 1) (when (> (abs (- end beg)) 1)
(rxt-quote-pcre (buffer-substring-no-properties beg end))))) (rxt-quote-pcre (buffer-substring-no-properties beg end)))))
"")) ""))
(prompt (format "%s%%s %s" (prompt (format "[%s %s] "
(symbol-name engine) (symbol-name engine)
(cond ((file-equal-p directory default-directory) (cond ((file-equal-p directory project-root)
"./")
((file-equal-p directory project-root)
(projectile-project-name)) (projectile-project-name))
((file-equal-p directory default-directory)
"./")
((file-relative-name directory project-root))))) ((file-relative-name directory project-root)))))
(command (command
(pcase engine (pcase engine
@ -153,12 +153,14 @@ order.
('grep (+helm--grep-search directory query prompt all-files recursive) ('grep (+helm--grep-search directory query prompt all-files recursive)
(cl-return t)))) (cl-return t))))
(helm-ag-base-command (string-join command " "))) (helm-ag-base-command (string-join command " ")))
(when (> (length query) 0) (cl-letf ((+helm-global-prompt prompt)
(setcdr (assq 'requires-pattern helm-source-do-ag) 1)) ((symbol-function 'helm-do-ag--helm)
(cl-letf (((symbol-function 'helm-ag--marked-input) (lambda (_escape) query))) (lambda () (helm :sources '(helm-source-do-ag)
(helm-do-ag directory) :buffer "*helm-ag*"
;; restore default :keymap helm-do-ag-map
(setcdr (assq 'requires-pattern helm-source-do-ag) 3)))) :input query
:history 'helm-ag--helm-history))))
(helm-do-ag directory))))
(defun +helm--get-command (format) (defun +helm--get-command (format)
(cl-loop for tool in (cl-remove-duplicates +helm-project-search-engines :from-end t) (cl-loop for tool in (cl-remove-duplicates +helm-project-search-engines :from-end t)