From 1ec4bac75e01ddcc896b8c00d8264a3306a9149e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 1 Sep 2024 14:34:06 -0400 Subject: [PATCH] bump: :completion abo-abo/swiper@2a25a6fb5b08 -> abo-abo/swiper@8dc02d5b725f company-mode/company-mode@1a0fc12a9c3d -> company-mode/company-mode@e1d331a64ec3 elken/yasnippet-capf@744dedb7837d -> elken/yasnippet-capf@4c2e33d70cd1 emacs-helm/helm@f8949afd9b44 -> emacs-helm/helm@06e0cf01486a minad/cape@f61da109a9e4 -> minad/cape@9110956a5155 minad/consult-flycheck@754f5497d827 -> minad/consult-flycheck@3b999ae98390 minad/consult@fe4852280006 -> minad/consult@0c3f53916ea0 minad/corfu@cdc3e13ad312 -> minad/corfu@921dd7c97ec4 minad/marginalia@da72da4622c7 -> minad/marginalia@50a51c69f006 minad/vertico@ba650a7ab90d -> minad/vertico@c682ef50e622 oantolin/embark@9c166c4b96a0 -> oantolin/embark@19a13e344e04 oantolin/orderless@53f5204ad3f5 -> oantolin/orderless@49d1fdfb80b5 radian-software/prescient.el@0765418e4362 -> radian-software/prescient.el@2b8a8b41228b rainstormstudio/nerd-icons-completion@c2db8557a3c1 -> rainstormstudio/nerd-icons-completion@426a1d7c29a0 Close: #7977 Co-authored-by: LemonBreezes --- modules/completion/company/packages.el | 2 +- modules/completion/corfu/config.el | 39 +++++++++++++------------- modules/completion/corfu/packages.el | 6 ++-- modules/completion/helm/packages.el | 2 +- modules/completion/ivy/packages.el | 4 +-- modules/completion/vertico/packages.el | 16 +++++------ 6 files changed, 34 insertions(+), 35 deletions(-) diff --git a/modules/completion/company/packages.el b/modules/completion/company/packages.el index a0ad69ad0..fe44c0760 100644 --- a/modules/completion/company/packages.el +++ b/modules/completion/company/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/company/packages.el -(package! company :pin "1a0fc12a9c3d25e28c22f319e7b097f435b1c27d") +(package! company :pin "e1d331a64ec39fe28c5be28cabf812e3eaab5b0f") (package! company-dict :pin "cd7b8394f6014c57897f65d335d6b2bd65dab1f4") (when (modulep! +childframe) (package! company-box :pin "c4f2e243fba03c11e46b1600b124e036f2be7691")) diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el index 11cf01504..60592c0a1 100644 --- a/modules/completion/corfu/config.el +++ b/modules/completion/corfu/config.el @@ -34,26 +34,6 @@ TAB/S-TAB.") (use-package! corfu :hook (doom-first-input . global-corfu-mode) - :init - (add-hook! 'minibuffer-setup-hook - (defun +corfu-enable-in-minibuffer () - "Enable Corfu in the minibuffer." - (when (pcase +corfu-want-minibuffer-completion - ('aggressive - (not (or (bound-and-true-p mct--active) - (bound-and-true-p vertico--input) - (and (featurep 'auth-source) - (eq (current-local-map) read-passwd-map)) - (and (featurep 'helm-core) (helm--alive-p)) - (and (featurep 'ido) (ido-active)) - (where-is-internal 'minibuffer-complete - (list (current-local-map))) - (memq #'ivy--queue-exhibit post-command-hook)))) - ('nil nil) - (_ (where-is-internal #'completion-at-point - (list (current-local-map))))) - (setq-local corfu-echo-delay nil) - (corfu-mode +1)))) :config (setq corfu-auto t corfu-auto-delay 0.24 @@ -80,6 +60,25 @@ TAB/S-TAB.") (add-to-list 'corfu-continue-commands #'+corfu/smart-sep-toggle-escape) (add-hook 'evil-insert-state-exit-hook #'corfu-quit) + (defun +corfu-enable-in-minibuffer-p () + "Return non-nil if Corfu should be enabled in the minibuffer. +See `+corfu-want-minibuffer-completion'." + (pcase +corfu-want-minibuffer-completion + ('nil nil) + ('aggressive + (not (or (bound-and-true-p mct--active) + (bound-and-true-p vertico--input) + (and (featurep 'auth-source) + (eq (current-local-map) read-passwd-map)) + (and (featurep 'helm-core) (helm--alive-p)) + (and (featurep 'ido) (ido-active)) + (where-is-internal 'minibuffer-complete + (list (current-local-map))) + (memq #'ivy--queue-exhibit post-command-hook)))) + (_ (where-is-internal #'completion-at-point + (list (current-local-map)))))) + (setq global-corfu-minibuffer #'+corfu-enable-in-minibuffer-p) + ;; HACK: If you want to update the visual hints after completing minibuffer ;; commands with Corfu and exiting, you have to do it manually. (defadvice! +corfu--insert-before-exit-minibuffer-a () diff --git a/modules/completion/corfu/packages.el b/modules/completion/corfu/packages.el index 9bc55ab8f..fe78eb17b 100644 --- a/modules/completion/corfu/packages.el +++ b/modules/completion/corfu/packages.el @@ -1,8 +1,8 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/corfu/packages.el -(package! corfu :pin "cdc3e13ad312f5f12b3f78f842fff0b398eb4473") -(package! cape :pin "f61da109a9e4491614938c300291060fd8855c1b") +(package! corfu :pin "921dd7c97ec41fe8ef81dd5f5a08b0f717586c86") +(package! cape :pin "9110956a5155d5e3c460160fa1b4dac59322c229") (when (modulep! +icons) (package! nerd-icons-corfu :pin "7077bb76fefc15aed967476406a19dc5c2500b3c")) (when (and (not (modulep! :completion vertico)) @@ -14,4 +14,4 @@ (when (modulep! :os tty) (package! corfu-terminal :pin "501548c3d51f926c687e8cd838c5865ec45d03cc")) (when (modulep! :editor snippets) - (package! yasnippet-capf :pin "744dedb7837d0c7e07817d36ec752a0cd813f55c")) + (package! yasnippet-capf :pin "4c2e33d70cd1d95cf1e08d134b058a6dd90a99c9")) diff --git a/modules/completion/helm/packages.el b/modules/completion/helm/packages.el index 86826dea7..5fc216050 100644 --- a/modules/completion/helm/packages.el +++ b/modules/completion/helm/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/helm/packages.el -(package! helm :pin "f8949afd9b44de4a8149874ef40e1250826d40bd") +(package! helm :pin "06e0cf01486a430b1f6792af78297837d3d77d97") (package! helm-company :pin "4622b82353220ee6cc33468f710fa5b6b253b7f1") (package! helm-c-yasnippet :pin "c5880e740da101fde7a995e94a7b16c330e57583") (package! helm-descbinds :pin "ca03f02da4e54a1d0a2d5498b86e1639aa808d8c") diff --git a/modules/completion/ivy/packages.el b/modules/completion/ivy/packages.el index 244452ed4..b33d89e33 100644 --- a/modules/completion/ivy/packages.el +++ b/modules/completion/ivy/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/ivy/packages.el -(package! swiper :pin "2a25a6fb5b081cb141c5eccac8ee58ab1feeb747") +(package! swiper :pin "8dc02d5b725f78d1f80904807b46f5406f129674") (package! ivy) (package! ivy-hydra) (package! ivy-avy) @@ -13,7 +13,7 @@ (package! wgrep :pin "208b9d01cfffa71037527e3a324684b3ce45ddc4") (if (modulep! +prescient) - (package! ivy-prescient :pin "0765418e4362099db8788fcb745ce9b7602aa001") + (package! ivy-prescient :pin "2b8a8b41228bddb2e11eb1c200e98a9edd04797c") (when (modulep! +fuzzy) (package! flx :pin "4b1346eb9a8a76ee9c9dede69738c63ad97ac5b6"))) diff --git a/modules/completion/vertico/packages.el b/modules/completion/vertico/packages.el index 3f8583b27..0a67a9d6c 100644 --- a/modules/completion/vertico/packages.el +++ b/modules/completion/vertico/packages.el @@ -1,24 +1,24 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/vertico/packages.el -(package! vertico :pin "ba650a7ab90d66686ba787937ac9e71f749c598e") +(package! vertico :pin "c682ef50e62237435e9fc287927ce4181b49be90") -(package! orderless :pin "53f5204ad3f541e11eb6eeb9b86584964b7a3678") +(package! orderless :pin "49d1fdfb80b55699a00b11bc916ad29c0447039b") -(package! consult :pin "fe4852280006e61be7f1374d021ee06155ce5a26") +(package! consult :pin "0c3f53916ea0db0c472c0a0c620a85cc1b00caf2") (package! consult-dir :pin "15891383f34d43acc5bb82bda92239b1f54cf178") (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) - (package! consult-flycheck :pin "754f5497d827f7d58009256a21af614cc44378a3")) -(package! embark :pin "9c166c4b96a0b1e85401bcc6fb95ce021e7b5013") -(package! embark-consult :pin "9c166c4b96a0b1e85401bcc6fb95ce021e7b5013") + (package! consult-flycheck :pin "3b999ae983900c16c0b5b5c30b7eca640d386a76")) +(package! embark :pin "19a13e344e04bbf861eaa74491b23da52b398672") +(package! embark-consult :pin "19a13e344e04bbf861eaa74491b23da52b398672") -(package! marginalia :pin "da72da4622c7b38741e6968678028f7e0564816c") +(package! marginalia :pin "50a51c69f006ec8b3ba1c570555d279d4cff6d99") (package! wgrep :pin "208b9d01cfffa71037527e3a324684b3ce45ddc4") (when (modulep! +icons) - (package! nerd-icons-completion :pin "c2db8557a3c1a9588d111f8c8e91cae96ee85010")) + (package! nerd-icons-completion :pin "426a1d7c29a04ae8e6ae9b55b0559f11a1e8b420")) (when (modulep! +childframe) (package! vertico-posframe