Vertico improvements: theming, bugfixes, new bindings, adaptations to upstream changes #5299

iyefrat · 2021-07-26T13:04:40Z

This PR contains:

bumps for :completion vertico and :ui doom
teco's recent theming improvements for marginalia and orderless
better keys for consult-crm
a fix for <leader> c j since it used cmd! instead of cmd!!
binding the new consult-line-multi to <leader s B> (the prefix argument makes it search all buffers, without it it just searches buffers of the current project)
usage of the recently introduced new embark indicator format
add marginalia annotations to functions that don't have them
advise the marginalia annotations for the project-file category to use projectile
a bugfix for consult-recent-file
bugfixes for +vertico/find-file-in
replacing an obsolete embark function
cc: @tecosaur @elken @minad

modules/ui/doom/packages.el

modules/completion/vertico/autoload/vertico.el

iyefrat · 2021-07-27T18:13:21Z

I'm converting this back to draft because there are some cool upstream embark changes that would be a shame to wait until the next bump to get, but require a bit of manual work on my part to fix the which key intergration. Should be ready soonish.

iyefrat · 2021-07-27T20:23:39Z

modules/completion/vertico/config.el

-          (which-key--show-keymap "Embark" map nil nil 'no-paging)
-          #'which-key--hide-popup-ignore-command)
-        embark-become-indicator embark-action-indicator)
+  (setq embark-indicator #'+vertico/embark-which-key-indicator)


Note that there is an interesting alternative to the which-key indicator, the recently introduced verbose indicator (it's what's used by default). it looks like this:

this is more useful than which-key information-wise, but breaks with doom using which key everywhere else, and this information can also be reached by pressing C-h to start a vertico filtering session.

Nice!

Hey, you should send that screenshot to Omar, who needs a nice screenshot!

Uh I think that screenshots on the embark readme should probably have things like a nonarbitrary aspect ratio and not cutting off lines of text at the bottom. Also they should probably be taken from a reasonably default config, e.g. not having the doom modeline, or icons.

Although this reminds me, I should probably add a screenshot to all-the-icons-completion

What's different about the new which-key one, other than that submenus work?

Nothing that I can notice to be honest

The main point of having a new which-key indicator is that the indicator protocol changed so the old one won't work anymore! But also, the new one displays (in the which-key help message) whether you are using embark-act or embark-become, and also shows the current target and an ellipsis when there are further targets you can cycle to.

iyefrat · 2021-07-28T13:50:47Z

@hlissner also note 9d2131b, the lazy loading of recentf-mode introduced in 97048e2 had the side effect having consult previews on when using SPC f r, due to the fact that consult-customize works on named commands. This fixes that using advice, hopefully that's fine.

numkem · 2021-07-28T15:58:27Z

Is it possible to ad the icons to projectile-find-file?

Thanks!

iyefrat · 2021-07-28T17:21:50Z

@numkem yeah I'll add this to all-the-icons-completion and bump it, good catch

Edit: fixed

modules/completion/vertico/config.el

modules/config/default/+evil-bindings.el

hlissner

Looks good! Just one correction and I think this is ready to merge.

modules/completion/vertico/config.el

minad/consult@28f9ba8 -> minad/consult@69bbd21 minad/marginalia@a3a8edb -> minad/marginalia@1123544 minad/vertico@4a90297 -> minad/vertico@9de6709 oantolin/embark@be03ce9 -> oantolin/embark@1a7e6b5 iyefrat/all-the-icons-completion@24cdb3b -> iyefrat/all-the-icons-completion@d1d4b2f update embark indicator to new format

doomemacs/themes@5221b06 -> doomemacs/themes@9e2680b

- needs to be `cmd!!` for the prefix argument - use descriptive quoted symbol instead of `'(4)` for prefix arg

- use `doom-project-root` in the annotation category `project-file` (marginalia uses `project.el`) - annotate more functions, alphabetize list

Turning on `recentf-mode` in a `cmd!` (introduced in 97048e2) means that the `consult-customize` that turns off the previews doesn't work. This is fixed by advising the function instead.

- require `consult` (`consult--directory-prompt` isn't autoloaded) - set category to `'file`

- replace obsolete `embark-default-action` with `embark-dwim` - add `defvar` for `embark-quiet-after-action` to fix lexical var bug

gagbo/consult-lsp@c882749 -> gagbo/consult-lsp@e8a50f2 compatibility fix with new versions of consult

hlissner · 2021-07-31T08:34:53Z

Looks good to me. Great work! And thanks again!

iyefrat requested a review from hlissner as a code owner July 26, 2021 13:04

iyefrat marked this pull request as draft July 26, 2021 13:06

hlissner requested changes Jul 26, 2021

View reviewed changes

modules/ui/doom/packages.el Outdated Show resolved Hide resolved

modules/completion/vertico/autoload/vertico.el Outdated Show resolved Hide resolved

hlissner added is:feature Adds or requests new features, or extends existing ones is:update An effort to catch up with changes made elsewhere module:completion/vertico Pertains to Doom's :completion vertico module labels Jul 26, 2021

iyefrat force-pushed the vertico-improvements branch 4 times, most recently from 29354c5 to f827beb Compare July 27, 2021 12:40

iyefrat changed the title ~~[DRAFT] Vertico theme and crm improvements~~ Vertico improvements: theming, crm, bugfix,<leader> s B Jul 27, 2021

iyefrat changed the title ~~Vertico improvements: theming, crm, bugfix,<leader> s B~~ Vertico improvements: theming, crm, bugfix, <leader> s B Jul 27, 2021

iyefrat marked this pull request as ready for review July 27, 2021 12:43

iyefrat force-pushed the vertico-improvements branch from f827beb to c448928 Compare July 27, 2021 16:19

iyefrat marked this pull request as draft July 27, 2021 18:12

iyefrat force-pushed the vertico-improvements branch from c448928 to 554e530 Compare July 27, 2021 20:12

iyefrat changed the title ~~Vertico improvements: theming, crm, bugfix, <leader> s B~~ Vertico improvements: theming, crm, bugfix, <leader> s B, new embark indicator Jul 27, 2021

iyefrat marked this pull request as ready for review July 27, 2021 20:13

iyefrat force-pushed the vertico-improvements branch from 554e530 to c15e1cd Compare July 27, 2021 20:17

iyefrat commented Jul 27, 2021

View reviewed changes

iyefrat force-pushed the vertico-improvements branch 2 times, most recently from 2f848b2 to 9d2131b Compare July 28, 2021 13:49

iyefrat changed the title ~~Vertico improvements: theming, crm, bugfix, <leader> s B, new embark indicator~~ Vertico improvements: theming, bugfixes, new bindings, adaptations to upstream changes Jul 28, 2021

iyefrat force-pushed the vertico-improvements branch 3 times, most recently from cf780b0 to 624bd9d Compare July 28, 2021 18:05

iyefrat force-pushed the vertico-improvements branch from 007266b to ec78473 Compare July 28, 2021 21:13

iyefrat marked this pull request as draft July 28, 2021 21:23

iyefrat force-pushed the vertico-improvements branch from ec78473 to d4396ac Compare July 28, 2021 21:29

iyefrat marked this pull request as ready for review July 28, 2021 21:30

iyefrat force-pushed the vertico-improvements branch 3 times, most recently from c4d9609 to 76bc719 Compare July 29, 2021 17:37

iyefrat commented Jul 29, 2021

View reviewed changes

modules/completion/vertico/config.el Outdated Show resolved Hide resolved

minad reviewed Jul 29, 2021

View reviewed changes

modules/config/default/+evil-bindings.el Outdated Show resolved Hide resolved

iyefrat force-pushed the vertico-improvements branch from ec833fe to ef277b3 Compare July 29, 2021 23:13

hlissner requested changes Jul 31, 2021

View reviewed changes

modules/completion/vertico/config.el Outdated Show resolved Hide resolved

iyefrat added 9 commits July 31, 2021 10:41

bump: :ui doom

099a4ac

doomemacs/themes@5221b06 -> doomemacs/themes@9e2680b

feat(vertico): better crm interface

4c3c027

fix(vertico): <leader> c J binding

9e31d0d

- needs to be `cmd!!` for the prefix argument - use descriptive quoted symbol instead of `'(4)` for prefix arg

feat(vertico): add <leader> s B binding

b790123

feat(vertico): improve marginalia annotations

859fc4e

- use `doom-project-root` in the annotation category `project-file` (marginalia uses `project.el`) - annotate more functions, alphabetize list

fix(vertico): consult-recent-file previews

a23cb1f

Turning on `recentf-mode` in a `cmd!` (introduced in 97048e2) means that the `consult-customize` that turns off the previews doesn't work. This is fixed by advising the function instead.

fix(vertico): +vertico/find-file-in...

19c4090

- require `consult` (`consult--directory-prompt` isn't autoloaded) - set category to `'file`

nit(vertico): sharpquote a quoted function

f7863f9

iyefrat force-pushed the vertico-improvements branch from ef277b3 to aac2c2d Compare July 31, 2021 07:49

fix(vertico): +vertico/embark-preview bug

3af07d2

- replace obsolete `embark-default-action` with `embark-dwim` - add `defvar` for `embark-quiet-after-action` to fix lexical var bug

iyefrat force-pushed the vertico-improvements branch from aac2c2d to 3af07d2 Compare July 31, 2021 07:51

bump: consult-lsp

41772a8

gagbo/consult-lsp@c882749 -> gagbo/consult-lsp@e8a50f2 compatibility fix with new versions of consult

hlissner approved these changes Jul 31, 2021

View reviewed changes

hlissner merged commit e65e2ea into doomemacs:develop Jul 31, 2021

iyefrat mentioned this pull request Jul 31, 2021

Add a changelog/release notes for the next release oantolin/embark#317

Closed

iyefrat deleted the vertico-improvements branch August 6, 2021 23:16

github-actions bot locked as resolved and limited conversation to collaborators Nov 5, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Vertico improvements: theming, bugfixes, new bindings, adaptations to upstream changes #5299

Vertico improvements: theming, bugfixes, new bindings, adaptations to upstream changes #5299

Uh oh!

iyefrat commented Jul 26, 2021 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

iyefrat commented Jul 27, 2021

Uh oh!

iyefrat Jul 27, 2021 •

edited

Loading

Uh oh!

bdarcus Jul 27, 2021

Uh oh!

iyefrat Jul 27, 2021

Uh oh!

bdarcus Jul 27, 2021

Uh oh!

iyefrat Jul 27, 2021

Uh oh!

oantolin Jul 28, 2021 •

edited

Loading

Uh oh!

iyefrat commented Jul 28, 2021

Uh oh!

numkem commented Jul 28, 2021

Uh oh!

iyefrat commented Jul 28, 2021 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

hlissner left a comment

Uh oh!

Uh oh!

hlissner commented Jul 31, 2021

Uh oh!

Uh oh!

Uh oh!

Vertico improvements: theming, bugfixes, new bindings, adaptations to upstream changes #5299

Vertico improvements: theming, bugfixes, new bindings, adaptations to upstream changes #5299

Uh oh!

Conversation

iyefrat commented Jul 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

iyefrat commented Jul 27, 2021

Uh oh!

iyefrat Jul 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bdarcus Jul 27, 2021

Choose a reason for hiding this comment

Uh oh!

iyefrat Jul 27, 2021

Choose a reason for hiding this comment

Uh oh!

bdarcus Jul 27, 2021

Choose a reason for hiding this comment

Uh oh!

iyefrat Jul 27, 2021

Choose a reason for hiding this comment

Uh oh!

oantolin Jul 28, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

iyefrat commented Jul 28, 2021

Uh oh!

numkem commented Jul 28, 2021

Uh oh!

iyefrat commented Jul 28, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hlissner left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hlissner commented Jul 31, 2021

Uh oh!

Uh oh!

iyefrat commented Jul 26, 2021 •

edited

Loading

iyefrat Jul 27, 2021 •

edited

Loading

oantolin Jul 28, 2021 •

edited

Loading

iyefrat commented Jul 28, 2021 •

edited

Loading