From 8789e2e5c67eb13fe4c3cc92fa99028b60236342 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 23 Feb 2023 22:39:04 -0500 Subject: [PATCH] refactor(helm): reformat and revise comments Ref: #6676 Co-authored-by: johanwiden --- modules/completion/helm/config.el | 58 +++++++++++++++-------------- modules/completion/helm/packages.el | 14 +++---- 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/modules/completion/helm/config.el b/modules/completion/helm/config.el index f68ba74f7..ea939d1ac 100644 --- a/modules/completion/helm/config.el +++ b/modules/completion/helm/config.el @@ -23,23 +23,6 @@ Can be negative.") (use-package! helm-mode :hook (doom-first-input . helm-mode) - :init - (map! [remap apropos] #'helm-apropos - [remap find-library] #'helm-locate-library - [remap bookmark-jump] #'helm-bookmarks - [remap execute-extended-command] #'helm-M-x - [remap find-file] #'helm-find-files - [remap locate] #'helm-locate - [remap imenu] #'helm-semantic-or-imenu - [remap noop-show-kill-ring] #'helm-show-kill-ring - [remap persp-switch-to-buffer] #'+helm/workspace-mini - [remap switch-to-buffer] #'helm-buffers-list - [remap projectile-find-file] #'+helm/projectile-find-file - [remap projectile-recentf] #'helm-projectile-recentf - [remap projectile-switch-project] #'helm-projectile-switch-project - [remap projectile-switch-to-buffer] #'helm-projectile-switch-to-buffer - [remap recentf-open-files] #'helm-recentf - [remap yank-pop] #'helm-show-kill-ring) :config ;; helm is too heavy for `find-file-at-point' (add-to-list 'helm-completing-read-handlers-alist (cons #'find-file-at-point nil))) @@ -57,11 +40,29 @@ Can be negative.") helm-display-buffer-default-width nil helm-display-buffer-default-height 0.25 ;; When calling `helm-semantic-or-imenu', don't immediately jump to - ;; symbol at point + ;; symbol at point. helm-imenu-execute-action-at-once-if-one nil - ;; disable special behavior for left/right, M-left/right keys. + ;; Disable special behavior for left/right, M-left/right keys. helm-ff-lynx-style-map nil) + (map! [remap apropos] #'helm-apropos + [remap find-library] #'helm-locate-library + [remap bookmark-jump] #'helm-bookmarks + [remap execute-extended-command] #'helm-M-x + [remap find-file] #'helm-find-files + [remap ibuffer-find-file] #'helm-find-files + [remap locate] #'helm-locate + [remap imenu] #'helm-semantic-or-imenu + [remap noop-show-kill-ring] #'helm-show-kill-ring + [remap persp-switch-to-buffer] #'+helm/workspace-mini + [remap switch-to-buffer] #'helm-buffers-list + [remap projectile-find-file] #'+helm/projectile-find-file + [remap projectile-recentf] #'helm-projectile-recentf + [remap projectile-switch-project] #'helm-projectile-switch-project + [remap projectile-switch-to-buffer] #'helm-projectile-switch-to-buffer + [remap recentf-open-files] #'helm-recentf + [remap yank-pop] #'helm-show-kill-ring) + (when (modulep! :editor evil +everywhere) (setq helm-default-prompt-display-function #'+helm--set-prompt-display)) @@ -79,8 +80,9 @@ Can be negative.") helm-projectile-fuzzy-match fuzzy helm-recentf-fuzzy-match fuzzy helm-semantic-fuzzy-match fuzzy) - ;; Make sure that we have helm-multi-matching or fuzzy matching, - ;; (as prescribed by the fuzzy flag) also in the following cases: + + ;; Make sure that we have helm-multi-matching or fuzzy matching, (as + ;; prescribed by the fuzzy flag) also in the following cases: ;; ;; - helmized commands that use `completion-at-point' and similar functions ;; - native commands that fall back to `completion-styles' like `helm-M-x' @@ -115,8 +117,7 @@ Can be negative.") (use-package! helm-flx :when (modulep! +fuzzy) - :hook (helm-mode . helm-flx-mode) - :config (helm-flx-mode +1)) + :hook (helm-mode . helm-flx-mode)) (after! helm-rg @@ -160,6 +161,7 @@ Can be negative.") '(org-set-tags . helm-org-completing-read-tags)))) +;; DEPRECATED: Remove when projectile is replaced with project.el (use-package! helm-projectile :commands (helm-projectile-find-file helm-projectile-recentf @@ -171,9 +173,11 @@ Can be negative.") (set-keymap-parent helm-projectile-find-file-map helm-map)) -(setq ivy-height 20) ; for `swiper-isearch' -(after! swiper-helm - (setq swiper-helm-display-function +(use-package! swiper-helm + :defer t + :config + (setq ivy-height 20 + swiper-helm-display-function (lambda (buf &optional _resume) (pop-to-buffer buf))) (global-set-key [remap swiper] #'swiper-helm) (add-to-list 'swiper-font-lock-exclude #'+doom-dashboard-mode nil #'eq)) @@ -184,8 +188,8 @@ Can be negative.") (use-package! helm-icons - :after helm :when (modulep! +icons) + :hook (helm-mode . helm-icons-enable) :init (setq helm-icons-provider 'all-the-icons) :config diff --git a/modules/completion/helm/packages.el b/modules/completion/helm/packages.el index 1def74b5d..94237eddb 100644 --- a/modules/completion/helm/packages.el +++ b/modules/completion/helm/packages.el @@ -2,21 +2,19 @@ ;;; completion/helm/packages.el (package! helm :pin "dfd6403947c5cd9f32afcd6bc92a1756cc958c82") -(package! helm-rg :pin "ee0a3c09da0c843715344919400ab0a0190cc9dc") -(package! helm-c-yasnippet :pin "e214eec8b2875d8a7cd09006dfb6a8e15e9e4079") (package! helm-company :pin "6eb5c2d730a60e394e005b47c1db018697094dde") -(package! helm-describe-modes - :recipe (:host github :repo "emacs-helm/helm-describe-modes") - :pin "11fb36af119b784539d31c6160002de1957408aa") +(package! helm-c-yasnippet :pin "e214eec8b2875d8a7cd09006dfb6a8e15e9e4079") +(package! helm-descbinds :pin "b72515982396b6e336ad7beb6767e95a80fca192") +(package! helm-describe-modes :pin "11fb36af119b784539d31c6160002de1957408aa") (package! helm-projectile :pin "35a2111d00c0c0c9d8743280d3f1243bb217118a") +(package! helm-rg :pin "ee0a3c09da0c843715344919400ab0a0190cc9dc") (package! swiper-helm :pin "93fb6db87bc6a5967898b5fd3286954cc72a0008") (when (modulep! +childframe) (package! helm-posframe :pin "87461b52b6f3f378c63642a33f584d4a4ba28351")) (when (modulep! +fuzzy) (package! helm-flx :pin "5220099e695a3586dba2d59640217fe378e66310")) -(when (modulep! :lang org) - (package! helm-org :pin "d67186d3a64e610c03a5f3d583488f018fb032e4")) (when (modulep! +icons) (package! helm-icons :pin "8d2f5e705c8b78a390677cf242024739c932fc95")) -(package! helm-descbinds :pin "b72515982396b6e336ad7beb6767e95a80fca192") +(when (modulep! :lang org) + (package! helm-org :pin "d67186d3a64e610c03a5f3d583488f018fb032e4"))