From 7f5e778b0c3abe14b2597f9b93fb399ff2335e62 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 4 Aug 2018 19:52:09 +0200
Subject: [PATCH] Replace helm-swoop with swiper-helm

Swiper is superior. The downside is it pulls in ivy as a dependency, but
that is acceptable considering how small it is.
---
 modules/completion/helm/config.el   | 13 +++----------
 modules/completion/helm/packages.el |  2 +-
 modules/config/default/+bindings.el |  4 ++--
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/modules/completion/helm/config.el b/modules/completion/helm/config.el
index e5f184f50..c7a53d3f4 100644
--- a/modules/completion/helm/config.el
+++ b/modules/completion/helm/config.el
@@ -144,16 +144,9 @@ If you want to already use git-grep or grep, set this to nil.")
   (set-keymap-parent helm-projectile-find-file-map helm-map))
 
 
-(def-package! helm-swoop ; https://github.com/ShingoFukuyama/helm-swoop
-  :commands helm-multi-swoop-all
-  :config
-  (setq helm-swoop-use-line-number-face t
-        helm-swoop-candidate-number-limit 200
-        helm-swoop-speed-or-color t
-        ;; no initial input
-        helm-swoop-pre-input-function (lambda () "")
-        ;; Always split below current window
-        helm-swoop-split-with-multiple-windows t))
+;; `swiper-helm'
+(setq swiper-helm-display-function
+      (lambda (buf &optional _resume) (pop-to-buffer buf)))
 
 
 (def-package! wgrep
diff --git a/modules/completion/helm/packages.el b/modules/completion/helm/packages.el
index 9144ff576..13e0452b7 100644
--- a/modules/completion/helm/packages.el
+++ b/modules/completion/helm/packages.el
@@ -8,7 +8,7 @@
 (package! helm-css-scss)
 (package! helm-describe-modes :recipe (:fetcher github :repo "emacs-helm/helm-describe-modes"))
 (package! helm-projectile)
-(package! helm-swoop)
+(package! swiper-helm)
 (package! wgrep)
 (when (featurep! +fuzzy)
   (package! helm-flx))
diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index 6b544743f..c4ce5581e 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -60,7 +60,7 @@
       :n "M-c"   #'evil-yank
       :n "M-q"   (if (daemonp) #'delete-frame #'evil-quit-all)
       (:when (featurep! :completion helm)
-        :n "M-f" #'helm-swoop)
+        :n "M-f" #'swiper-helm)
       (:when (featurep! :completion ivy)
         :n "M-f" #'swiper)
       :n  "M-s"   #'save-buffer
@@ -522,7 +522,7 @@
           :desc "Project"                :nv "p" #'+ivy/project-search
           :desc "Directory"              :nv "d" (λ! (+ivy/project-search t)))
         (:when (featurep! :completion helm)
-          :desc "Buffer"                 :nv "b" #'helm-swoop
+          :desc "Buffer"                 :nv "b" #'swiper-helm
           :desc "Project"                :nv "p" #'+helm/project-search
           :desc "Directory"              :nv "d" (λ! (+helm/project-search t)))
         :desc "Symbols"                :nv "i" #'imenu