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

bump: :completion vertico

Browse source 
iyefrat/all-the-icons-completion@d1d4b2f0df -> iyefrat/all-the-icons-completion@9650041854
minad/consult@69bbd213dc -> minad/consult@105a1ac501
minad/marginalia@1123544536 -> minad/marginalia@c6ca58bea8
minad/vertico@9de6709cdd -> minad/vertico@81a4b35f8d
oantolin/embark@1a7e6b5561 -> oantolin/embark@19145d5a33
oantolin/orderless@1e84120a28 -> oantolin/orderless@1a7011ac9c

- Adapt consult async commands to new consult-x-args format instead of
  consult-x-command.
- Change regepx in +vertico-file-search to emacs instead of pcre,
  because consult switched to using only emacs regexps
- Move to new embark-indicators variable, and replace
  embark-mixed-indicator with +vertico/embark-which-key-indicator to be
  compatible with future changes
- Adapt Doom's optional usage of fd to new consult command format
This commit is contained in:
Itai Y. Efrat 2021-08-10 17:48:00 +03:00
parent c3fc7da5f1
commit 940f66fa89
3 changed files with 48 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

49
modules/completion/vertico/autoload/vertico.el
View file

@ -40,20 +40,19 @@ orderless."
(setq deactivate-mark t)
(let* ((project-root (or (doom-project-root) default-directory))
(directory (or in project-root))
(args
(split-string
(string-trim
(concat (if all-files "-uu")
(unless recursive "--maxdepth 1")
"--null --line-buffered --color=always --max-columns=500 --no-heading --line-number --smart-case"
" --hidden -g !.git "
(mapconcat #'shell-quote-argument args " ")))
" "))
(consult-ripgrep-args
(concat "rg "
(if all-files "-uu ")
(unless recursive "--maxdepth 1 ")
"--line-buffered --color=never --max-columns=1000 "
"--path-separator / --smart-case --no-heading --line-number "
"--hidden -g !.git "
(mapconcat #'shell-quote-argument args " ")
"."))
(prompt (if (stringp prompt) (string-trim prompt) "Search"))
(query (or query
(when (doom-region-active-p)
(rxt-quote-pcre (doom-thing-at-point-or-region)))))
(ripgrep-command (string-join `("rg" ,@args "." "-e ARG OPTS" ) " "))
(regexp-quote (doom-thing-at-point-or-region)))))
(consult-async-split-style consult-async-split-style)
(consult-async-split-styles-alist consult-async-split-styles-alist))
;; Change the split style if the initial query contains the separator.
@ -74,7 +73,7 @@ orderless."
"%")
:type perl)
consult-async-split-style 'perlalt))))))
(consult--grep prompt ripgrep-command directory query)))
(consult--grep prompt #'consult--ripgrep-builder directory query)))
;;;###autoload
(defun +vertico/project-search (&optional arg initial-query directory)
@ -175,9 +174,7 @@ If INITIAL is non-nil, use as initial input."
(require 'consult)
(let* ((default-directory (or dir default-directory))
(prompt-dir (consult--directory-prompt "Find" default-directory))
(cmd (split-string-and-unquote consult-find-command " "))
(cmd (remove "OPTS" cmd))
(cmd (remove "ARG" cmd)))
(cmd (split-string-and-unquote +vertico-consult-fd-args " ")))
(find-file
(consult--read
(split-string (cdr (apply #'doom-call-process cmd)) "\n" t)
@ -270,3 +267,25 @@ targets."
(interactive)
(run-at-time 0 nil #'vertico-exit)
(vertico-exit))
;;;###autoload
(defun +vertico--consult--fd-builder (input)
(pcase-let* ((cmd (split-string-and-unquote +vertico-consult-fd-args))
(`(,arg . ,opts) (consult--command-split input))
(`(,re . ,hl) (funcall consult--regexp-compiler
arg 'extended)))
(when re
(list :command (append cmd
(list (consult--join-regexps re 'extended))
opts)
:highlight hl))))
(autoload #'consult--directory-prompt "consult")
;;;###autoload
(defun +vertico/consult-fd (&optional dir initial)
(interactive "P")
(if doom-projectile-fd-binary
(let* ((prompt-dir (consult--directory-prompt "Fd" dir))
(default-directory (cdr prompt-dir)))
(find-file (consult--find (car prompt-dir) #'+vertico--consult--fd-builder initial)))
(consult-find dir initial)))